Saving and loading
Saving functionality added to master branch, loading still causing issues