Use mapper properly on controller. Need tests