Cleaning up a bunch of private functions and allowing reset if you lose
Fixing our SHIT