More work on simplifying the class stucture