General clean up. Added in Marionette and fixed api.