working on class design/some changes to syllabus