Final commit for the semester