Week5 + wk6 commits