Mappers hell solved

Only using automapper for now