comments and cleanup
reafactored
clean up
working on autosave
now going around in circles with autosave