more splitting out of role variables, etc.