WIP - Refactor approvals and authentication for origin