Revert "Pull COPY of Elliot's work into my changes"
Merge pull request #3 from Cbodfield/revert-2-Cody

Revert "Pull COPY of Elliot's work into my changes"