finished what used to be project 2, and now is project 3