initial commit of move to roles