Reworked pieces of authorization requests.

Reworked the key pieces to user authorization and started fixing auth
requests