First Draft of Model to Entity Mapper implemented (in wrong place)