Added syllabus functionality, etc