added some structure and the dependancies for marionette - got requires set up
merged new stuff