added the user manager
Merge branch 'prep-for-prod'