Finished Save, Needs Refactoring