Old and new classwork from oop