WIP more stuff
Merge pull request #4 from nathanielksmith/master

WIP more stuff