Copied over project 3 and started making some changes