Spiff new interface
Merge pull request #9 from aarondufall/mjm

Spiff new interface