first cut of transition

..
well that was easy

..
Merge pull request #13 from spinnytea/master

refactored class