diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e6109f7..20d3d93 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -10,25 +10,26 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: ACTIONS_ALLOW_UNSECURE_COMMANDS
-      id: ACTIONS_ALLOW_UNSECURE_COMMANDS
-      run: echo 'ACTIONS_ALLOW_UNSECURE_COMMANDS=true' >> $GITHUB_ENV
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 18
+        cache: 'yarn'
 
-    - name: add cr
-      run: |
-        mkdir -p $GITHUB_WORKSPACE/bin
-        wget -O $GITHUB_WORKSPACE/bin/cr https://github.com/calcit-lang/calcit/releases/download/0.6.0-a3-build2/cr
-        chmod +x $GITHUB_WORKSPACE/bin/cr
-        echo "::add-path::$GITHUB_WORKSPACE/bin"
+    - uses: supplypike/setup-bin@v3
+      with:
+        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0/cr'
+        name: 'cr'
+        version: '0.8.0'
 
-    - name: "prepare modules"
-      run: >
-        mkdir -p ~/.config/calcit/modules/ && cd ~/.config/calcit/modules/
-        && git clone https://github.com/calcit-lang/calcit-test.git
+    - uses: supplypike/setup-bin@v3
+      with:
+        uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.0/caps'
+        name: 'caps'
+        version: '0.8.0'
 
     - name: "test"
-      run: cr -1 --entry test
+      run: caps --ci && cr -1 --entry test
 
     - run: cr --emit-js -1 --entry test && yarn && node ./main.mjs
diff --git a/calcit.cirru b/calcit.cirru
index 86a7842..a4b6d65 100644
--- a/calcit.cirru
+++ b/calcit.cirru
@@ -1,165 +1,168 @@
 
-{}
+{} (:package |app)
   :configs $ {} (:init-fn |app.main/main!) (:port 6001) (:reload-fn |app.main/reload!) (:version |0.0.1)
     :modules $ [] |calcit-test/ |calcit.std/
   :entries $ {}
     :test $ {} (:init-fn |app.test/main!) (:reload-fn |app.test/reload!)
       :modules $ [] |calcit-test/
-  :ir $ {} (:package |app)
-    :files $ {}
-      |app.main $ {}
-        :configs $ {} (:extension nil)
-        :defs $ {}
-          |calling-func $ {} (:at 1635438145038) (:by |u0) (:type :expr)
+  :files $ {}
+    |app.main $ %{} :FileEntry
+      :defs $ {}
+        |calling-func $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1635438145038) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1635438146706) (:by |u0) (:text |defn) (:type :leaf)
-              |j $ {} (:at 1635438145038) (:by |u0) (:text |calling-func) (:type :leaf)
-              |r $ {} (:at 1635438145038) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1635438146706) (:by |u0) (:text |defn)
+              |j $ %{} :Leaf (:at 1635438145038) (:by |u0) (:text |calling-func)
+              |r $ %{} :Expr (:at 1635438145038) (:by |u0)
                 :data $ {}
-              |v $ {} (:at 1635438147671) (:by |u0) (:type :expr)
+              |v $ %{} :Expr (:at 1635438147671) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1635440602999) (:by |u0) (:text |println) (:type :leaf)
-                  |j $ {} (:at 1635438316806) (:by |u0) (:text "|\"todo bcc") (:type :leaf)
-          |main! $ {} (:at 1606310749711) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1635440602999) (:by |u0) (:text |println)
+                  |j $ %{} :Leaf (:at 1635438316806) (:by |u0) (:text "|\"todo bcc")
+        |main! $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1606310749711) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1606310749711) (:by |u0) (:text |defn) (:type :leaf)
-              |j $ {} (:at 1606310749711) (:by |u0) (:text |main!) (:type :leaf)
-              |r $ {} (:at 1606310749711) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1606310749711) (:by |u0) (:text |defn)
+              |j $ %{} :Leaf (:at 1606310749711) (:by |u0) (:text |main!)
+              |r $ %{} :Expr (:at 1606310749711) (:by |u0)
                 :data $ {}
-              |t $ {} (:at 1625340406714) (:by |u0) (:type :expr)
+              |t $ %{} :Expr (:at 1625340406714) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1625340407993) (:by |u0) (:text |run-tests) (:type :leaf)
-              |u $ {} (:at 1651385435232) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1625340407993) (:by |u0) (:text |run-tests)
+              |u $ %{} :Expr (:at 1651385435232) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1651385435232) (:by |u0) (:text |set-interval) (:type :leaf)
-                  |b $ {} (:at 1651385435232) (:by |u0) (:text |2000) (:type :leaf)
-                  |h $ {} (:at 1651385435232) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1651385435232) (:by |u0) (:text |set-interval)
+                  |b $ %{} :Leaf (:at 1651385435232) (:by |u0) (:text |2000)
+                  |h $ %{} :Expr (:at 1651385435232) (:by |u0)
                     :data $ {}
-                      |T $ {} (:at 1651385435232) (:by |u0) (:text |fn) (:type :leaf)
-                      |b $ {} (:at 1651385435232) (:by |u0) (:type :expr)
+                      |T $ %{} :Leaf (:at 1651385435232) (:by |u0) (:text |fn)
+                      |b $ %{} :Expr (:at 1651385435232) (:by |u0)
                         :data $ {}
-                      |h $ {} (:at 1651385435232) (:by |u0) (:type :expr)
+                      |h $ %{} :Expr (:at 1651385435232) (:by |u0)
                         :data $ {}
-                          |T $ {} (:at 1651385435232) (:by |u0) (:text |calling-func) (:type :leaf)
-          |on-error $ {} (:at 1606310757107) (:by |u0) (:type :expr)
+                          |T $ %{} :Leaf (:at 1651385435232) (:by |u0) (:text |calling-func)
+        |on-error $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1606310757107) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1606310757107) (:by |u0) (:text |defn) (:type :leaf)
-              |j $ {} (:at 1606310757107) (:by |u0) (:text |on-error) (:type :leaf)
-              |r $ {} (:at 1606310757107) (:by |u0) (:type :expr)
-                :data $ {}
-                  |T $ {} (:at 1606310780908) (:by |u0) (:text |message) (:type :leaf)
-              |v $ {} (:at 1606311673317) (:by |u0) (:type :expr)
-                :data $ {}
-                  |D $ {} (:at 1606370713438) (:by |u0) (:text |;) (:type :leaf)
-                  |T $ {} (:at 1606311684125) (:by |u0) (:text |draw-error-message) (:type :leaf)
-                  |j $ {} (:at 1606311685136) (:by |u0) (:text |message) (:type :leaf)
-          |reload! $ {} (:at 1606310753106) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1606310757107) (:by |u0) (:text |defn)
+              |j $ %{} :Leaf (:at 1606310757107) (:by |u0) (:text |on-error)
+              |r $ %{} :Expr (:at 1606310757107) (:by |u0)
+                :data $ {}
+                  |T $ %{} :Leaf (:at 1606310780908) (:by |u0) (:text |message)
+              |v $ %{} :Expr (:at 1606311673317) (:by |u0)
+                :data $ {}
+                  |D $ %{} :Leaf (:at 1606370713438) (:by |u0) (:text |;)
+                  |T $ %{} :Leaf (:at 1606311684125) (:by |u0) (:text |draw-error-message)
+                  |j $ %{} :Leaf (:at 1606311685136) (:by |u0) (:text |message)
+        |reload! $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1606310753106) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1606310753106) (:by |u0) (:text |defn) (:type :leaf)
-              |j $ {} (:at 1606310753106) (:by |u0) (:text |reload!) (:type :leaf)
-              |r $ {} (:at 1606310753106) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1606310753106) (:by |u0) (:text |defn)
+              |j $ %{} :Leaf (:at 1606310753106) (:by |u0) (:text |reload!)
+              |r $ %{} :Expr (:at 1606310753106) (:by |u0)
                 :data $ {}
-              |v $ {} (:at 1606310801441) (:by |u0) (:type :expr)
+              |v $ %{} :Expr (:at 1606310801441) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1606310803027) (:by |u0) (:text |echo) (:type :leaf)
-                  |j $ {} (:at 1625293407488) (:by |u0) (:text "|\"Reloaded.") (:type :leaf)
-        :ns $ {} (:at 1606310745262) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1606310803027) (:by |u0) (:text |echo)
+                  |j $ %{} :Leaf (:at 1625293407488) (:by |u0) (:text "|\"Reloaded.")
+      :ns $ %{} :CodeEntry (:doc |)
+        :code $ %{} :Expr (:at 1606310745262) (:by |u0)
           :data $ {}
-            |T $ {} (:at 1606310745262) (:by |u0) (:text |ns) (:type :leaf)
-            |j $ {} (:at 1606310745262) (:by |u0) (:text |app.main) (:type :leaf)
-            |r $ {} (:at 1625340359278) (:by |u0) (:type :expr)
+            |T $ %{} :Leaf (:at 1606310745262) (:by |u0) (:text |ns)
+            |j $ %{} :Leaf (:at 1606310745262) (:by |u0) (:text |app.main)
+            |r $ %{} :Expr (:at 1625340359278) (:by |u0)
               :data $ {}
-                |T $ {} (:at 1625340360591) (:by |u0) (:text |:require) (:type :leaf)
-                |j $ {} (:at 1625340360867) (:by |u0) (:type :expr)
+                |T $ %{} :Leaf (:at 1625340360591) (:by |u0) (:text |:require)
+                |j $ %{} :Expr (:at 1625340360867) (:by |u0)
                   :data $ {}
-                    |T $ {} (:at 1625340363084) (:by |u0) (:text |app.test) (:type :leaf)
-                    |j $ {} (:at 1625340363810) (:by |u0) (:text |:refer) (:type :leaf)
-                    |r $ {} (:at 1625340366421) (:by |u0) (:type :expr)
+                    |T $ %{} :Leaf (:at 1625340363084) (:by |u0) (:text |app.test)
+                    |j $ %{} :Leaf (:at 1625340363810) (:by |u0) (:text |:refer)
+                    |r $ %{} :Expr (:at 1625340366421) (:by |u0)
                       :data $ {}
-                        |T $ {} (:at 1625340368206) (:by |u0) (:text |run-tests) (:type :leaf)
-                |r $ {} (:at 1635438174394) (:by |u0) (:type :expr)
+                        |T $ %{} :Leaf (:at 1625340368206) (:by |u0) (:text |run-tests)
+                |r $ %{} :Expr (:at 1635438174394) (:by |u0)
                   :data $ {}
-                    |T $ {} (:at 1635438179295) (:by |u0) (:text |calcit.std.time) (:type :leaf)
-                    |j $ {} (:at 1635438177953) (:by |u0) (:text |:refer) (:type :leaf)
-                    |r $ {} (:at 1635438180356) (:by |u0) (:type :expr)
+                    |T $ %{} :Leaf (:at 1635438179295) (:by |u0) (:text |calcit.std.time)
+                    |j $ %{} :Leaf (:at 1635438177953) (:by |u0) (:text |:refer)
+                    |r $ %{} :Expr (:at 1635438180356) (:by |u0)
                       :data $ {}
-                        |T $ {} (:at 1635438182183) (:by |u0) (:text |set-interval) (:type :leaf)
-        :proc $ {} (:at 1606310745262) (:by |u0) (:type :expr)
-          :data $ {}
-      |app.test $ {}
-        :configs $ {}
-        :defs $ {}
-          |main! $ {} (:at 1651385630841) (:by |u0) (:type :expr)
+                        |T $ %{} :Leaf (:at 1635438182183) (:by |u0) (:text |set-interval)
+    |app.test $ %{} :FileEntry
+      :defs $ {}
+        |main! $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1651385630841) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1651385630841) (:by |u0) (:text |defn) (:type :leaf)
-              |b $ {} (:at 1651385630841) (:by |u0) (:text |main!) (:type :leaf)
-              |h $ {} (:at 1651385630841) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1651385630841) (:by |u0) (:text |defn)
+              |b $ %{} :Leaf (:at 1651385630841) (:by |u0) (:text |main!)
+              |h $ %{} :Expr (:at 1651385630841) (:by |u0)
                 :data $ {}
-              |l $ {} (:at 1651385633767) (:by |u0) (:type :expr)
+              |l $ %{} :Expr (:at 1651385633767) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1651385635804) (:by |u0) (:text |run-tests) (:type :leaf)
-          |reload! $ {} (:at 1651385641606) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1651385635804) (:by |u0) (:text |run-tests)
+        |reload! $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1651385641606) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1651385641606) (:by |u0) (:text |defn) (:type :leaf)
-              |b $ {} (:at 1651385641606) (:by |u0) (:text |reload!) (:type :leaf)
-              |h $ {} (:at 1651385641606) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1651385641606) (:by |u0) (:text |defn)
+              |b $ %{} :Leaf (:at 1651385641606) (:by |u0) (:text |reload!)
+              |h $ %{} :Expr (:at 1651385641606) (:by |u0)
                 :data $ {}
-              |l $ {} (:at 1651385642773) (:by |u0) (:type :expr)
+              |l $ %{} :Expr (:at 1651385642773) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1651385643658) (:by |u0) (:text |println) (:type :leaf)
-                  |b $ {} (:at 1651385646578) (:by |u0) (:text "|\"TODO reload") (:type :leaf)
-          |run-tests $ {} (:at 1625339970921) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1651385643658) (:by |u0) (:text |println)
+                  |b $ %{} :Leaf (:at 1651385646578) (:by |u0) (:text "|\"TODO reload")
+        |run-tests $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1625339970921) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1625339972421) (:by |u0) (:text |defn) (:type :leaf)
-              |j $ {} (:at 1625339970921) (:by |u0) (:text |run-tests) (:type :leaf)
-              |r $ {} (:at 1625339970921) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1625339972421) (:by |u0) (:text |defn)
+              |j $ %{} :Leaf (:at 1625339970921) (:by |u0) (:text |run-tests)
+              |r $ %{} :Expr (:at 1625339970921) (:by |u0)
                 :data $ {}
-              |t $ {} (:at 1625340033281) (:by |u0) (:type :expr)
+              |t $ %{} :Expr (:at 1625340033281) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1625340034982) (:by |u0) (:text |reset!) (:type :leaf)
-                  |j $ {} (:at 1625340036265) (:by |u0) (:text |*quit-on-failure?) (:type :leaf)
-                  |r $ {} (:at 1625340037959) (:by |u0) (:text |true) (:type :leaf)
-              |v $ {} (:at 1625339973401) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1625340034982) (:by |u0) (:text |reset!)
+                  |j $ %{} :Leaf (:at 1625340036265) (:by |u0) (:text |*quit-on-failure?)
+                  |r $ %{} :Leaf (:at 1625340037959) (:by |u0) (:text |true)
+              |v $ %{} :Expr (:at 1625339973401) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1625339982550) (:by |u0) (:text |test-add) (:type :leaf)
-          |test-add $ {} (:at 1625339983101) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1625339982550) (:by |u0) (:text |test-add)
+        |test-add $ %{} :CodeEntry (:doc |)
+          :code $ %{} :Expr (:at 1625339983101) (:by |u0)
             :data $ {}
-              |T $ {} (:at 1625339986557) (:by |u0) (:text |deftest) (:type :leaf)
-              |j $ {} (:at 1625339983101) (:by |u0) (:text |test-add) (:type :leaf)
-              |r $ {} (:at 1625340048519) (:by |u0) (:type :expr)
+              |T $ %{} :Leaf (:at 1625339986557) (:by |u0) (:text |deftest)
+              |j $ %{} :Leaf (:at 1625339983101) (:by |u0) (:text |test-add)
+              |r $ %{} :Expr (:at 1625340048519) (:by |u0)
                 :data $ {}
-                  |T $ {} (:at 1625340049484) (:by |u0) (:text |testing) (:type :leaf)
-                  |j $ {} (:at 1625340052314) (:by |u0) (:text ||add) (:type :leaf)
-                  |r $ {} (:at 1625340054484) (:by |u0) (:type :expr)
+                  |T $ %{} :Leaf (:at 1625340049484) (:by |u0) (:text |testing)
+                  |j $ %{} :Leaf (:at 1625340052314) (:by |u0) (:text ||add)
+                  |r $ %{} :Expr (:at 1625340054484) (:by |u0)
                     :data $ {}
-                      |T $ {} (:at 1625340055860) (:by |u0) (:text |is) (:type :leaf)
-                      |j $ {} (:at 1625340056137) (:by |u0) (:type :expr)
+                      |T $ %{} :Leaf (:at 1625340055860) (:by |u0) (:text |is)
+                      |j $ %{} :Expr (:at 1625340056137) (:by |u0)
                         :data $ {}
-                          |T $ {} (:at 1625340056311) (:by |u0) (:text |=) (:type :leaf)
-                          |j $ {} (:at 1625340057399) (:by |u0) (:text |2) (:type :leaf)
-                          |r $ {} (:at 1625340057796) (:by |u0) (:type :expr)
+                          |T $ %{} :Leaf (:at 1625340056311) (:by |u0) (:text |=)
+                          |j $ %{} :Leaf (:at 1625340057399) (:by |u0) (:text |2)
+                          |r $ %{} :Expr (:at 1625340057796) (:by |u0)
                             :data $ {}
-                              |T $ {} (:at 1625340058161) (:by |u0) (:text |+) (:type :leaf)
-                              |j $ {} (:at 1625340058562) (:by |u0) (:text |1) (:type :leaf)
-                              |r $ {} (:at 1625340138662) (:by |u0) (:text |1) (:type :leaf)
-        :ns $ {} (:at 1625339956346) (:by |u0) (:type :expr)
+                              |T $ %{} :Leaf (:at 1625340058161) (:by |u0) (:text |+)
+                              |j $ %{} :Leaf (:at 1625340058562) (:by |u0) (:text |1)
+                              |r $ %{} :Leaf (:at 1625340138662) (:by |u0) (:text |1)
+      :ns $ %{} :CodeEntry (:doc |)
+        :code $ %{} :Expr (:at 1625339956346) (:by |u0)
           :data $ {}
-            |T $ {} (:at 1625339956346) (:by |u0) (:text |ns) (:type :leaf)
-            |j $ {} (:at 1625339956346) (:by |u0) (:text |app.test) (:type :leaf)
-            |r $ {} (:at 1625340009385) (:by |u0) (:type :expr)
+            |T $ %{} :Leaf (:at 1625339956346) (:by |u0) (:text |ns)
+            |j $ %{} :Leaf (:at 1625339956346) (:by |u0) (:text |app.test)
+            |r $ %{} :Expr (:at 1625340009385) (:by |u0)
               :data $ {}
-                |T $ {} (:at 1625340010270) (:by |u0) (:text |:require) (:type :leaf)
-                |j $ {} (:at 1625340010573) (:by |u0) (:type :expr)
+                |T $ %{} :Leaf (:at 1625340010270) (:by |u0) (:text |:require)
+                |j $ %{} :Expr (:at 1625340010573) (:by |u0)
                   :data $ {}
-                    |T $ {} (:at 1625340015655) (:by |u0) (:text |calcit-test.core) (:type :leaf)
-                    |j $ {} (:at 1625340016422) (:by |u0) (:text |:refer) (:type :leaf)
-                    |r $ {} (:at 1625340016945) (:by |u0) (:type :expr)
+                    |T $ %{} :Leaf (:at 1625340015655) (:by |u0) (:text |calcit-test.core)
+                    |j $ %{} :Leaf (:at 1625340016422) (:by |u0) (:text |:refer)
+                    |r $ %{} :Expr (:at 1625340016945) (:by |u0)
                       :data $ {}
-                        |T $ {} (:at 1625340018567) (:by |u0) (:text |deftest) (:type :leaf)
-                        |j $ {} (:at 1625340020648) (:by |u0) (:text |testing) (:type :leaf)
-                        |r $ {} (:at 1625340021012) (:by |u0) (:text |is) (:type :leaf)
-                        |v $ {} (:at 1625340040078) (:by |u0) (:text |*quit-on-failure?) (:type :leaf)
-        :proc $ {} (:at 1625339956346) (:by |u0) (:type :expr)
-          :data $ {}
+                        |T $ %{} :Leaf (:at 1625340018567) (:by |u0) (:text |deftest)
+                        |j $ %{} :Leaf (:at 1625340020648) (:by |u0) (:text |testing)
+                        |r $ %{} :Leaf (:at 1625340021012) (:by |u0) (:text |is)
+                        |v $ %{} :Leaf (:at 1625340040078) (:by |u0) (:text |*quit-on-failure?)
   :users $ {}
     |u0 $ {} (:avatar nil) (:id |u0) (:name |chen) (:nickname |chen) (:password |d41d8cd98f00b204e9800998ecf8427e) (:theme :star-trail)
diff --git a/compact.cirru b/compact.cirru
index f47f885..b211f29 100644
--- a/compact.cirru
+++ b/compact.cirru
@@ -6,32 +6,42 @@
     :test $ {} (:init-fn |app.test/main!) (:reload-fn |app.test/reload!)
       :modules $ [] |calcit-test/
   :files $ {}
-    |app.main $ {}
+    |app.main $ %{} :FileEntry
       :defs $ {}
-        |calling-func $ quote
-          defn calling-func () $ println "\"todo bcc"
-        |main! $ quote
-          defn main! () (run-tests)
-            set-interval 2000 $ fn () (calling-func)
-        |on-error $ quote
-          defn on-error (message) (; draw-error-message message)
-        |reload! $ quote
-          defn reload! () $ echo "\"Reloaded."
-      :ns $ quote
-        ns app.main $ :require
-          app.test :refer $ run-tests
-          calcit.std.time :refer $ set-interval
-    |app.test $ {}
+        |calling-func $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn calling-func () $ println "\"todo bcc"
+        |main! $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn main! () (run-tests)
+              set-interval 2000 $ fn () (calling-func)
+        |on-error $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn on-error (message) (; draw-error-message message)
+        |reload! $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn reload! () $ echo "\"Reloaded."
+      :ns $ %{} :CodeEntry (:doc |)
+        :code $ quote
+          ns app.main $ :require
+            app.test :refer $ run-tests
+            calcit.std.time :refer $ set-interval
+    |app.test $ %{} :FileEntry
       :defs $ {}
-        |main! $ quote
-          defn main! () $ run-tests
-        |reload! $ quote
-          defn reload! () $ println "\"TODO reload"
-        |run-tests $ quote
-          defn run-tests () (reset! *quit-on-failure? true) (test-add)
-        |test-add $ quote
-          deftest test-add $ testing |add
-            is $ = 2 (+ 1 1)
-      :ns $ quote
-        ns app.test $ :require
-          calcit-test.core :refer $ deftest testing is *quit-on-failure?
+        |main! $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn main! () $ run-tests
+        |reload! $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn reload! () $ println "\"TODO reload"
+        |run-tests $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            defn run-tests () (reset! *quit-on-failure? true) (test-add)
+        |test-add $ %{} :CodeEntry (:doc |)
+          :code $ quote
+            deftest test-add $ testing |add
+              is $ = 2 (+ 1 1)
+      :ns $ %{} :CodeEntry (:doc |)
+        :code $ quote
+          ns app.test $ :require
+            calcit-test.core :refer $ deftest testing is *quit-on-failure?
diff --git a/package.cirru b/package.cirru
new file mode 100644
index 0000000..9b47875
--- /dev/null
+++ b/package.cirru
@@ -0,0 +1,6 @@
+
+{}
+  :dependencies $ {}
+    |calcit-lang/calcit-test |main
+    |calcit-lang/calcit.std |main
+
diff --git a/package.json b/package.json
index 31d7988..dc2ee59 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "version": "0.0.7",
   "dependencies": {
-    "@calcit/procs": "^0.6.0-a3"
+    "@calcit/procs": "^0.8.0"
   },
   "scripts": {},
   "devDependencies": {}
diff --git a/yarn.lock b/yarn.lock
index 1c0b54c..e31a40a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,26 +2,26 @@
 # yarn lockfile v1
 
 
-"@calcit/procs@^0.6.0-a3":
-  version "0.6.0-a3"
-  resolved "https://registry.yarnpkg.com/@calcit/procs/-/procs-0.6.0-a3.tgz#699e603ec52b2a50e58259930749da56f3351ee1"
-  integrity sha512-me0e9ZeNYPDwVirDJ+13xqa8M3mDR6GkEjFBgULZnk82ned1s4D5XsOKiMYzGBaqanrpv0108JIjILQciMDk5g==
+"@calcit/procs@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.npmmirror.com/@calcit/procs/-/procs-0.8.0.tgz#ce682f5d016e2ebfa25cf2dd1852bfcccb64bb86"
+  integrity sha512-fLnsR0MAP4W2TsJ3ftVsO51RyudZoMCVEfsxjoaw5FAg6m09YgDDfkWKElNDQwljsHcV8ZmiyCdZpJLCEmdEkw==
   dependencies:
-    "@calcit/ternary-tree" "0.0.19"
-    "@cirru/parser.ts" "^0.0.5"
-    "@cirru/writer.ts" "^0.1.3"
+    "@calcit/ternary-tree" "0.0.23"
+    "@cirru/parser.ts" "^0.0.6"
+    "@cirru/writer.ts" "^0.1.4"
 
-"@calcit/ternary-tree@0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@calcit/ternary-tree/-/ternary-tree-0.0.19.tgz#b5b33a3d07a9e603feeef7cd642958c83628122f"
-  integrity sha512-dn2kNlcOQOPtCAeE68MHcRgrZzRP+jNKBmDW2wO0S8HTUA2SeAbpzZoK0HfcTHFmlGl6yKpjZ95rICQ319AjcA==
+"@calcit/ternary-tree@0.0.23":
+  version "0.0.23"
+  resolved "https://registry.npmmirror.com/@calcit/ternary-tree/-/ternary-tree-0.0.23.tgz#a299f7ffd614ac2dfe2cbcf78506934df4008c77"
+  integrity sha512-GKHfokm1YBUvPprV9p227fDpE+w4lVl4YKQpfKoNEqvprJnC4HRXaa+QSLwZkvZlXr09hAA0x4l4ZKUIcbYydg==
 
-"@cirru/parser.ts@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@cirru/parser.ts/-/parser.ts-0.0.5.tgz#12325a69561b95e219e049790c53d5479dc2c1e5"
-  integrity sha512-jmucRW6fQX+HhFZKeN37TDO8ejBxgxLDX9RvU7WKSDM/7peGtfyu9+b6G8NMi4a8wqpDACTvnzbgZId7Xi5bHw==
+"@cirru/parser.ts@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.npmmirror.com/@cirru/parser.ts/-/parser.ts-0.0.6.tgz#b95a84e02273fcbd71ff100925782b6f86410234"
+  integrity sha512-qpDNPq+IuuwYjQFI+wzpd3ntbF7lwJs90v1XWyLQbL9Ru4ld4aHxVGwW/9F/QOu5mEGCMXtagCoYDf0HtOpDZg==
 
-"@cirru/writer.ts@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@cirru/writer.ts/-/writer.ts-0.1.3.tgz#5f54bdecaa20ba3dab16cbe6da711854138a9c0a"
-  integrity sha512-vJnhmhm7we5UfQIwmZfQpF3bAFbVybzT6LbmkbQHxgijaQg3gPfNVsnSIa3g3KpmWVtvkzEx+nUy5aMwsJiV1A==
+"@cirru/writer.ts@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.npmmirror.com/@cirru/writer.ts/-/writer.ts-0.1.4.tgz#4b5851d002ab7c4891457bf8c707f09620c8f122"
+  integrity sha512-Uy3Y7jjLdaxLW9ajZuIS9rp+dhaSVU95hRRwvnP6E16PwgPl+zGs6Xqn1L7Lqw07ypujrdBBdFQyRJOLc6IHQQ==