Adding store/retrieve, extracted code from html. Big refactor coming ...
Merge branch 'master' into gh-pages