Initial work on orm
ORM improvements
Add a simple object store