Changed to Marionette

Also implemented updated interactions with the UI