has touch been merged into Marionette now?