reorganizing the role, let's see if travis is still happy...