diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj
index 5de0601f..89429857 100644
--- a/desktop/src-common/advent/actions.clj
+++ b/desktop/src-common/advent/actions.clj
@@ -16,7 +16,8 @@
   (begin [this screen entities])
   (done? [this screen entities])
   (continue [this screen entities])
-  (terminate [this screen entities]))
+  (terminate [this screen entities])
+  (get-channel [this]))
 
 (defmacro get-script [entities & forms]
   `(fn [starting-entities#]
@@ -45,9 +46,17 @@
         dy (- y1 y2)]
     (Math/sqrt (+ (* dx dx) (* dy dy)))))
 
+(defmacro run-action [entities & forms]
+  `(let [c# (chan)]
+     (do
+       (put! (get-in (deref ~entities) [:actions :channel])
+             (reify IAction
+               (get-channel [_] c#)
+               ~@forms))
+       (reset! ~entities (<!! c#)))))
+
 (defn walk-to [entities target-id [final-x final-y]]
-  (let [c (chan)
-        {start-x :x start-y :y} (@entities target-id)
+  (let [{start-x :x start-y :y} (@entities target-id)
         final-x (int final-x)
         final-y (int final-y)
         path (vec (take-nth 5 (advent.pathfind/visit-all
@@ -59,118 +68,95 @@
                [])
         targets-left (atom path)]
     (if (seq path)
-      (do
-        (put! (get-in @entities [:actions :channel])
-              (reify
-                IAction
-                (begin [this screen entities]
-                  entities)
+      (run-action entities
+                  (begin [this screen entities]
+                         entities)
 
-                (continue [this screen entities]
-                  (let [{from-x :x from-y :y :keys [left right] :as target-entity} (entities target-id)
-                        [[target-x target-y] remainder] @targets-left]
-                    (let [delta-x (- target-x from-x)
-                          delta-y (- target-y from-y)
-                          distance (dist from-x from-y target-x target-y)
-                          moved-x (if (= 0.0 distance)
-                                    0
-                                    (* 1.5 (/ delta-x distance)))
-                          moved-y (if (= 0.0 distance)
-                                    0
-                                    (* 1.5 (/ delta-y distance)))]
-                      (if (< distance 1)
-                        (do (swap! targets-left rest)
-                            entities)
-                        (update-in entities [target-id]
-                                   #(assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)])
-                                      :anim (cond (< delta-x 0) left
-                                                  (> delta-x 0) right
-                                                  :else (:anim %))))))))
+                  (continue [this screen entities]
+                            (let [{from-x :x from-y :y :keys [left right] :as target-entity} (entities target-id)
+                                  [[target-x target-y] remainder] @targets-left]
+                              (let [delta-x (- target-x from-x)
+                                    delta-y (- target-y from-y)
+                                    distance (dist from-x from-y target-x target-y)
+                                    moved-x (if (= 0.0 distance)
+                                              0
+                                              (* 1.5 (/ delta-x distance)))
+                                    moved-y (if (= 0.0 distance)
+                                              0
+                                              (* 1.5 (/ delta-y distance)))]
+                                (if (< distance 1)
+                                  (do (swap! targets-left rest)
+                                      entities)
+                                  (update-in entities [target-id]
+                                             #(assoc (jump-to screen entities % [(+ moved-x from-x) (+ moved-y from-y)])
+                                                :anim (cond (< delta-x 0) left
+                                                            (> delta-x 0) right
+                                                            :else (:anim %))))))))
 
-                (done? [this screen entities]
-                  (let [{from-x :x from-y :y :keys [left right anim] :as target-entity} (entities target-id)]
-                    (< (dist final-x final-y from-x from-y) 1)))
+                  (done? [this screen entities]
+                         (let [{from-x :x from-y :y :keys [left right anim] :as target-entity} (entities target-id)]
+                           (< (dist final-x final-y from-x from-y) 1)))
 
-                (terminate [this screen entities]
-                  (let [entities (stop screen entities target-id)]
-                    (put! c entities)
-                    entities))))
-        (reset! entities (<!! c)))
+                  (terminate [this screen entities]
+                             (stop screen entities target-id)))
       @entities)))
 
 (defn get-text-duration [text]
   (* (count (s/split text #" ")) 0.75))
 
 (defn talk [entities target-id text]
-  (let [c (chan)
-        initial-time (atom nil)]
-    (put! (get-in @entities [:actions :channel])
-          (reify
-            IAction
-            (begin [this screen entities]
-              (let [_ (swap! initial-time #(or % (:total-time screen)))
-                    target-y (get-in entities [target-id :y])
-                    scale-fn (get-in entities [:background :scale-fn])
-                    scale (scale-fn target-y)
-                    height (* scale 36)]
-                (run! dialogue/talking-screen :on-talk :text text 
-                      :x (get-in entities [target-id :x]) :y (+ (get-in entities [target-id :y]) height)
-                      :target-id target-id
-                      :scale scale)
-                (assoc-in entities [target-id :anim] (get-in entities [target-id :talk]))))
+  (let [initial-time (atom nil)]
+    (run-action entities
+                (begin [this screen entities]
+                       (let [_ (swap! initial-time #(or % (:total-time screen)))
+                             target-y (get-in entities [target-id :y])
+                             scale-fn (get-in entities [:background :scale-fn])
+                             scale (scale-fn target-y)
+                             height (* scale 36)]
+                         (run! dialogue/talking-screen :on-talk :text text 
+                               :x (get-in entities [target-id :x]) :y (+ (get-in entities [target-id :y]) height)
+                               :target-id target-id
+                               :scale scale)
+                         (assoc-in entities [target-id :anim] (get-in entities [target-id :talk]))))
 
-            (continue [this screen entities] entities)
+                (continue [this screen entities] entities)
 
-            (done? [this screen entities]
-              (> (- (:total-time screen)
-                    @initial-time)
-                 (get-text-duration text)))
+                (done? [this screen entities]
+                       (> (- (:total-time screen)
+                             @initial-time)
+                          (get-text-duration text)))
 
-            (terminate [this screen entities]
-              (put! c entities)
-              (run! dialogue/talking-screen :stop-talk :target-id target-id)
-              (stop screen entities target-id))))
-    (reset! entities (<!! c))))
+                (terminate [this screen entities]
+                           (run! dialogue/talking-screen :stop-talk :target-id target-id)
+                           (stop screen entities target-id)))))
 
 (defn give [entities target-id item]
-  (let [c (chan)]
-    (put! (get-in @entities [:actions :channel])
-          (reify
-            IAction
-            (begin [this screen entities]
-              (sound! (sound "pickup.mp3") :play)
+  (run-action entities
+              (begin [this screen entities]
+                     (sound! (sound "pickup.mp3") :play)
 
-              (-> entities
-                  (update-in [target-id :inventory] #(conj % item))
-                  (assoc-in [:cursor :current] item)))
+                     (-> entities
+                         (update-in [target-id :inventory] #(conj % item))
+                         (assoc-in [:cursor :current] item)))
 
-            (continue [this screen entities] entities)
+              (continue [this screen entities] entities)
 
-            (done? [this screen entities]
-              true)
+              (done? [this screen entities] true)
 
-            (terminate [this screen entities]
-              (put! c entities)
-              entities)))
-    (reset! entities (<!! c))))
+              (terminate [this screen entities] 
+                         entities)))
 
 (defn transition-background [entities new-background [x y]]
-  (let [c (chan)]
-    (put! (get-in @entities [:actions :channel])
-          (reify
-            IAction
-            (begin [this screen entities] 
-              (-> entities
-                  (assoc-in [:background] (get-in entities [:backgrounds new-background]))
-                  (assoc-in [:ego :x] x)
-                  (assoc-in [:ego :y] y)))
+  (run-action entities
+              (begin [this screen entities] 
+                     (-> entities
+                         (assoc-in [:background] (get-in entities [:backgrounds new-background]))
+                         (assoc-in [:ego :x] x)
+                         (assoc-in [:ego :y] y)))
 
-            (continue [this screen entities] entities)
+              (continue [this screen entities] entities)
 
-            (done? [this screen entities]
-              true)
+              (done? [this screen entities] true)
 
-            (terminate [this screen entities]
-              (put! c entities)
-              entities)))
-    (reset! entities (<!! c))))
+              (terminate [this screen entities]
+                         entities)))
diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj
index 32cc9156..f224898c 100644
--- a/desktop/src-common/advent/screens/scene.clj
+++ b/desktop/src-common/advent/screens/scene.clj
@@ -79,8 +79,10 @@
     (let [entities (if started? entities (actions/begin current screen entities))
           entities (actions/continue current screen entities)]
       (if (actions/done? current screen entities)
-        (recur screen (assoc (actions/terminate current screen entities)
-                        :actions {:channel channel :current nil :started? false}))
+        (let [terminated (actions/terminate current screen entities)]
+          (put! (actions/get-channel current) terminated)
+          (recur screen (assoc terminated
+                          :actions {:channel channel :current nil :started? false})))
         (assoc-in entities [:actions :started?] true)))
     (let [[current _] (alts!! [channel] :default nil)]
       (assoc entities :actions {:channel channel :current current :started? false}))))