Week 3 commit almost finished