Feature/new domain objects

Two new domain objects, to pave the way for future features.