Added FS save to localstorage
Merge branch 'add-fs-save-localstorage'
Add proper system restore