improvement to replacement
relocated helpers
TODOs
improvements to building multiple mappers of the same type