Add a reduced version of Autosave proposal by John Bartolomew