More work on the new classes

Everything is falling in place now. Excellent