Started to rearrange things back, started looking at POST events for roles