continued work on classes