stuff
Merge pull request #1 from jakerm2002/things

stuff