WIP Integrating Teaspoon.

Don't merge.