Add autosave
Merge branch 'edit'