Added service for preparing incoming data for hydration, still needs a lot of work