Started implementing the authorization step