Added a marionette bootstrap
Lost of changes