Ma/fetch org authz

Creating a PR for this so I can comment and fix