It's been a while since I last posted, still working on Rivvi