Move user data functions into a repository.  Not sure that is the pattern I want yet but at least it is lifted out now.