Added in marionette, rewrote toolbox, event handling