Completed most of Pauls changes, in the middle of working on autosave