Finish adding roles, still completely untested