Work on Marionette refactor