continue Marionette refactor