Completed first half of marionette update.