Switching role logic to test auditor stuff. (Should change later to use reasons)
Merge branch 'roles' into testing