[WIP] Domain model, part 2

Change-Id: Iae029ad9ed0eefd55e9d1cb520a81cf85b4ffe85