Basic conversion of Operator Role, beginning some name changing and code cleanup