part one of multiple commits refactoring to use mappers lib