Reworking the sequence of topics in OOP.