Feature/mapper hydrators

reverting for now.