Added stuff from past semesters