A lot more work on Class 1