Rewriting with new architecture with Marionette.