Initial changes for project 3