Feature/base object model

Fixes #2