Working on authorization and user flow - unfinished
fixed error and working again
Merge branch 'authorization'