More demos, big rewrite for Marionette
Bunch of updates to demos, more concise