WORKING VERSION!

fixed storing bug
moved some code to the modelMapper