Phase 2 - seperated user stuff into its own bundle