Added Mapper class, added tests for mapper
Fixed conflict
Initial commit on develop branch