          (delete-scrolled-notes scroll-touches)
          (record-touches touches))))
 
-(defn fire-touch-data-on-instrument
-  [instrument data]
-  (let [touches (touch-data->touches data)]
-    (->> instrument
-         maybe-init-synths
-         (start-notes touches)
-         (end-notes touches)
-         (handle-scrolling touches))))
+(defn fire-touches-on-instrument
+  [instrument touches]
+  (->> instrument
+       maybe-init-synths
+       (start-notes touches)
+       (end-notes touches)
+       (handle-scrolling touches)))
 
 (defn update-size [instrument canvas-id]
   (let [{w :w h :h :as window-size} (util/get-window-size)]

  (:require-macros [cljs.core.async.macros :refer [go]])
  (:require [goog.dom :as dom]
            [goog.events :as events]
            [cljs.core.async :as async :refer [<! put! chan timeout sliding-buffer close!]]
            [playmary.util :as util]
            [playmary.scales :as scales]))



(defn create-touch-input-channel
  [canvas-id]
  (async/merge [(touches canvas-id :touchstart)
                (touches canvas-id :touchend)
                (touches canvas-id :touchmove)]))

(defn step-time
  [instrument delta]
