progress on class driven