New Marionette architecture seems to be working