Add files from project 2 and project 3