Moved storage to in-mem, and persisting to localstorage in unload