week 5 and 6 commits