RE: Major type-class overhaul