Uncommented out Wrapper code.
Merge pull request #19 from cameronklein/joshuaBranch2

Uncommented out Wrapper code.