Prepared files for project3

Branched from early commit and prepared files for project 3.