First pass at class/extend re-architecture.