Week 3 commit, almost done.