diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index 20008893f..6e7e7deb5 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -1238,9 +1238,7 @@
   |=  =path
   ?>  (team:title our src)
   ?+    path  ~|(kiln-path/path !!)
-    [%vats ~]    abet
-  ::
-      [%ark ~]
+      [%vats ~]
     abet(moz :_(moz [%give %fact ~ %kiln-vats-snap-0 !>(ark)]))
   ==
 ::
diff --git a/pkg/base-dev/sur/hood.hoon b/pkg/base-dev/sur/hood.hoon
index 46d54751e..f1d33b3a3 100644
--- a/pkg/base-dev/sur/hood.hoon
+++ b/pkg/base-dev/sur/hood.hoon
@@ -1,6 +1,9 @@
 =,  clay
 =*  dude  dude:gall
 |%
+::  $snap: kiln snapshot
+::
++$  snap  (map desk arak)
 ::  $diff: subscription update
 ::
 +$  diff
diff --git a/pkg/garden/app/docket.hoon b/pkg/garden/app/docket.hoon
index 5c122665a..3707d075e 100644
--- a/pkg/garden/app/docket.hoon
+++ b/pkg/garden/app/docket.hoon
@@ -184,25 +184,47 @@
   ::
   ++  take-kiln
     ^-  (quip card _state)
-    ?+  -.sign   (on-agent:def:cc wire sign)
-      %kick  [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state]
-    ::
+    ?+    -.sign  (on-agent:def:cc wire sign)
+        %kick  [(~(watch-our pass /kiln) %hood /kiln/vats)^~ state]
         %fact
-      ?.  ?=(%kiln-vats-diff-0 p.cage.sign)  `state
-      =+  !<(=diff:hood q.cage.sign)
-      =*  cha  ~(. ch desk.diff)
-      ?-  -.diff
-          ?(%block %reset %merge-sunk %merge-fail)
-        `state
+      |^  ^-  (quip card _state)
+      ?+  p.cage.sign  ~|(take-kiln-mark/p.cage.sign !!)
+        %kiln-vats-snap-0  (on-snap !<(snap:hood q.cage.sign))
+        %kiln-vats-diff-0  (on-diff !<(diff:hood q.cage.sign))
+      ==
       ::
-          %commit
+      ++  on-snap
+        |=  =snap:hood
+        ^-  (quip card _state)
+        =|  fex=(list card)
+        =/  ark  ~(tap by snap)
+        |-  ^-  (quip card _state)
+        ?~  ark  [(flop fex) state]
+        =^  caz  state  (on-commit i.ark)
+        $(ark t.ark, fex (weld (flop caz) fex))
+      ::
+      ++  on-diff
+        |=  =diff:hood
+        =+  !<(=diff:hood q.cage.sign)
+        ?-    -.diff
+            %commit   (on-commit [desk arak]:diff)
+            %suspend  (on-suspend [desk arak]:diff)
+            %revive   (on-revive [desk arak]:diff)
+            ?(%block %reset %merge-sunk %merge-fail)
+          `state
+        ==
+      ::
+      ++  on-commit
+        |=  [=desk =arak:hood]
+        ^-  (quip card _state)
+        =*  cha  ~(. ch desk)
         ?.  docket-exists:cha
-          ~&  [dap.bowl %no-docket-file-for desk.diff]
+          ~&  [dap.bowl %no-docket-file-for desk]
           `state
         ::  always update the docket in state to match clay's
         ::
         =/  =docket            docket:cha
-        =/  pre=(unit charge)  (~(get by charges) desk.diff)
+        =/  pre=(unit charge)  (~(get by charges) desk)
         =.  charges            (new-docket:cha docket)
         ::  if the new chad is a site, we're instantly done
         ::
@@ -211,7 +233,7 @@
           =.  charges  (new-chad:cha %site ~)
           state
         ::
-        =.  by-base  (~(put by by-base) base.href.docket desk.diff)
+        =.  by-base  (~(put by by-base) base.href.docket desk)
         ::  if the glob specification is unchanged, keep it
         ::
         ?:  &(?=(^ pre) =(href.docket.u.pre href.docket))
@@ -231,18 +253,24 @@
         =.  charges  (new-chad:cha %install ~)
         [[add-fact:cha fetch-glob:cha] state]
       ::
-          %suspend
-        ?.  (~(has by charges) desk.diff)  `state
+      ++  on-suspend
+        |=  [=desk =arak:hood]
+        ^-  (quip card _state)
+        =*  cha  ~(. ch desk)
+        ?.  (~(has by charges) desk)  `state
         =/  glob=(unit glob)
           =/  =chad
-            chad:(~(got by charges) desk.diff)
+            chad:(~(got by charges) desk)
           ?:(?=(%glob -.chad) `glob.chad ~)
         =.  charges  (new-chad:cha %suspend glob)
         :_(state ~[add-fact:cha])
       ::
-          %revive
-        ?.  (~(has by charges) desk.diff)  `state
-        =/  =charge  (~(got by charges) desk.diff)
+      ++  on-revive
+        |=  [=desk =arak:hood]
+        ^-  (quip card _state)
+        =*  cha  ~(. ch desk)
+        ?.  (~(has by charges) desk)  `state
+        =/  =charge  (~(got by charges) desk)
         ?.  ?=(%glob -.href.docket.charge)
           =.  charges  (new-chad:cha %site ~)
           :_(state ~[add-fact:cha])
@@ -252,7 +280,7 @@
             [%install ~]
           [%glob u.glob.chad.charge]
         :_(state [add-fact fetch-glob]:cha)
-      ==
+      --
     ==
   ++  take-charge
     |=  [=desk =^wire]