Refactor to Remove Duplication
Merge branch 'users_setup'