Merge refactored roles

I am such git newb. Somehow managed to rebase *and* merge.