EVERYTHING WORKS OMG
OMG
Merge pull request #72 from pmills88/Stephens_Branch

Stephens branch