Re-factored code and completing creation and loading of user identities.