Roles pt 3

Changes to main