Need to merge
Merge branches
Add registration and authorization