Reviewed r/3163
Continued work on Marionette refactor