Final commit week 3, everything working