More work on the baseclass