Local storage

Feature: 
closes #22
Bugs:
fixes #31 , fixes #32