- More work on some classes