Marionette

The mother of all PRs.  there is still some work left to be done, but much of the core functionality should be there.  Would be good to touch base on Tuesday.  Still hacking away at it, but it might be good to register what I have so far!  Expect/let me know if you find bugs!  :^]