Closes #20 - automapper issues.