Finish first iteration of project 1