Proj2 derrick

Merging Part 2 Changes to Master