GIANT REFACTORING. Superclass Level