New classes for the core class re-write.