Introduced stringMappingFactory - separating out the creation of these, decouples things and makes it a lot better for testing!
Merged - stringMappingFactory introduced!