More work on the new class hierarchy.