* Adding object store
* Refactored with ObjectStore

Fixes #8