Continued work on classes
Continued work on classes