Added localStorage
Merge branch 'wip-1'