More work on the base classes