WIP finishing up with domain objects