Add some structure to marionette stuff.