Initial commit still lot of work on domain objects