Added Mapper class work in progress.