cleaning up
some refactoring and cleaning, saving still not working
saving works, loading semi works
fixing loading