more work on classes

this card should probably be broken up but I don't know… [#61390844]