Start refactoring Work out of User
Merge pull request #951 from rjmcdonald83/master

Start refactoring Work out of User