Near final, if not final commit for Week 3