Roughly halfway done with adding new roles