continued work on the class structure