More work on core class.