New role annotations added. Now need to do tests, TH, printing core.