More setup for project 2