Fixed Class Structures Continued

ug