Mapper works, TODO: circular references
Mapper works with CircularReference
Refactor and clean up mapper
Always check for mappings
Add test for simple circularMapping
Refactor mapper code