committing almost temp
Merge pull request #3 from AaronGreenberg/master

We should get this merged