More work on base class