Let's try this, who knows what will happen...
Merge pull request #13 from theckman/moar_stubbing

Let's try this, who knows what will happen...