Defined more classes, and made defclass load cleanly.