more stuff
Merge pull request #1 from AdamKeesecker/master

bob, ok