continue Marionette refactoring