Marionette refactor and mozreview discussion