Refactored how AROs (roles) are used
Cleanup
More polish