Minor progress on class structure