Third milestone, now with new classes!