Added Models+Mapping (V1), ready for unit testing