Fills our more of the new state classes, and adds a few that have apparently been uncommitted for some time!