Merge refactored roles

I am such git newb. Somehow managed to rebase *and* merge.
Yep, fine as is - would be nice to include a link to the issue so it's easier to change later.