purged Marionette throughout--better modularization