Revert "Shane's work"
Merge pull request #3 from JesseStephenBrown/revert-2-master

Revert "Shane's work"