Merge with the roles changes

  There a bunch of spots where the roles haven't been properly integrated with,
so this patch should get some review.