Refactoring out automapper dependencies and attempting to abstract it away...