moving along with the domain model. Things are starting to look good :)