Rearrange to allow more logical addition of autosave
Autosave API op working.