Monday

Request to merge with master
I would keep this out. A mapper should map between two types. Anything else should be moved outside for SRP's sake.