Rewriting mapping logic to completely abstract out Automapper (Based upon MBB - cheers James!).