Beginning to modularize marionette modules