New mechanism to auto-save

Simpler and more mature handling of offline situations