More work laying out the class structure