WIP add some stuff
Merge pull request #3 from nathanielksmith/master

WIP add some stuff