Extracted org_auth creation, but still needs to be fully implemented