Add two new base classes. Repurpose some objects.