Review Saving Overhaul

Changed the code to make it simpler and so that it works properly