WIP on adding authorization (add_auth branch)