First major core 2 class refactoring as a result of the decisions made at COMBINE this year.