Started adding more classes, mostly incomplete at this point.