Towards an Object-Oriented Curriculum