Simpleroles

Simplified the roles

Plus this is all the stuff that's been in my tree (which is what we've been using for a while already)