Add user functionality
Merge conflicts
Fix merge errors