15 commits for project 3 and 4