First set of changes for project P3