Some additional pre-class work