Final commit for week 2, yay