Started adding entities
Stage the rest
Fluent mappings finished - preliminary tests