Refactor and simplification of the data store logic.
Merge branch 'dev' of github.com:matthew-andrews/app into dev