OOO Class 2 part 2

Possibly related…