Auth and setup
Refactored Autthorization a bit