diff --git a/src/c/arith/integer.c b/archive/c/arith/integer.c
similarity index 100%
rename from src/c/arith/integer.c
rename to archive/c/arith/integer.c
diff --git a/src/c/arith/integer.h b/archive/c/arith/integer.h
similarity index 100%
rename from src/c/arith/integer.h
rename to archive/c/arith/integer.h
diff --git a/src/c/arith/peano.c b/archive/c/arith/peano.c
similarity index 100%
rename from src/c/arith/peano.c
rename to archive/c/arith/peano.c
diff --git a/src/c/arith/peano.h b/archive/c/arith/peano.h
similarity index 100%
rename from src/c/arith/peano.h
rename to archive/c/arith/peano.h
diff --git a/src/c/arith/ratio.c b/archive/c/arith/ratio.c
similarity index 100%
rename from src/c/arith/ratio.c
rename to archive/c/arith/ratio.c
diff --git a/src/c/arith/ratio.h b/archive/c/arith/ratio.h
similarity index 100%
rename from src/c/arith/ratio.h
rename to archive/c/arith/ratio.h
diff --git a/src/c/arith/real.c b/archive/c/arith/real.c
similarity index 100%
rename from src/c/arith/real.c
rename to archive/c/arith/real.c
diff --git a/src/c/arith/real.h b/archive/c/arith/real.h
similarity index 100%
rename from src/c/arith/real.h
rename to archive/c/arith/real.h
diff --git a/src/c/authorise.c b/archive/c/authorise.c
similarity index 100%
rename from src/c/authorise.c
rename to archive/c/authorise.c
diff --git a/src/c/authorise.h b/archive/c/authorise.h
similarity index 100%
rename from src/c/authorise.h
rename to archive/c/authorise.h
diff --git a/src/c/debug.c b/archive/c/debug.c
similarity index 100%
rename from src/c/debug.c
rename to archive/c/debug.c
diff --git a/src/c/debug.h b/archive/c/debug.h
similarity index 100%
rename from src/c/debug.h
rename to archive/c/debug.h
diff --git a/src/c/init.c b/archive/c/init.c
similarity index 100%
rename from src/c/init.c
rename to archive/c/init.c
diff --git a/src/c/io/fopen.c b/archive/c/io/fopen.c
similarity index 100%
rename from src/c/io/fopen.c
rename to archive/c/io/fopen.c
diff --git a/src/c/io/fopen.h b/archive/c/io/fopen.h
similarity index 100%
rename from src/c/io/fopen.h
rename to archive/c/io/fopen.h
diff --git a/src/c/io/history.c b/archive/c/io/history.c
similarity index 100%
rename from src/c/io/history.c
rename to archive/c/io/history.c
diff --git a/src/c/io/history.h b/archive/c/io/history.h
similarity index 100%
rename from src/c/io/history.h
rename to archive/c/io/history.h
diff --git a/src/c/io/io.c b/archive/c/io/io.c
similarity index 100%
rename from src/c/io/io.c
rename to archive/c/io/io.c
diff --git a/src/c/io/io.h b/archive/c/io/io.h
similarity index 100%
rename from src/c/io/io.h
rename to archive/c/io/io.h
diff --git a/src/c/io/print.c b/archive/c/io/print.c
similarity index 100%
rename from src/c/io/print.c
rename to archive/c/io/print.c
diff --git a/src/c/io/print.h b/archive/c/io/print.h
similarity index 100%
rename from src/c/io/print.h
rename to archive/c/io/print.h
diff --git a/src/c/io/read.c b/archive/c/io/read.c
similarity index 100%
rename from src/c/io/read.c
rename to archive/c/io/read.c
diff --git a/src/c/io/read.h b/archive/c/io/read.h
similarity index 100%
rename from src/c/io/read.h
rename to archive/c/io/read.h
diff --git a/src/c/memory/conspage.c b/archive/c/memory/conspage.c
similarity index 100%
rename from src/c/memory/conspage.c
rename to archive/c/memory/conspage.c
diff --git a/src/c/memory/conspage.h b/archive/c/memory/conspage.h
similarity index 100%
rename from src/c/memory/conspage.h
rename to archive/c/memory/conspage.h
diff --git a/src/c/memory/consspaceobject.c b/archive/c/memory/consspaceobject.c
similarity index 100%
rename from src/c/memory/consspaceobject.c
rename to archive/c/memory/consspaceobject.c
diff --git a/src/c/memory/consspaceobject.h b/archive/c/memory/consspaceobject.h
similarity index 100%
rename from src/c/memory/consspaceobject.h
rename to archive/c/memory/consspaceobject.h
diff --git a/src/c/memory/cursor.c b/archive/c/memory/cursor.c
similarity index 100%
rename from src/c/memory/cursor.c
rename to archive/c/memory/cursor.c
diff --git a/src/c/memory/cursor.h b/archive/c/memory/cursor.h
similarity index 100%
rename from src/c/memory/cursor.h
rename to archive/c/memory/cursor.h
diff --git a/src/c/memory/dump.c b/archive/c/memory/dump.c
similarity index 100%
rename from src/c/memory/dump.c
rename to archive/c/memory/dump.c
diff --git a/src/c/memory/dump.h b/archive/c/memory/dump.h
similarity index 100%
rename from src/c/memory/dump.h
rename to archive/c/memory/dump.h
diff --git a/src/c/memory/hashmap.c b/archive/c/memory/hashmap.c
similarity index 100%
rename from src/c/memory/hashmap.c
rename to archive/c/memory/hashmap.c
diff --git a/src/c/memory/hashmap.h b/archive/c/memory/hashmap.h
similarity index 100%
rename from src/c/memory/hashmap.h
rename to archive/c/memory/hashmap.h
diff --git a/src/c/memory/lookup3.c b/archive/c/memory/lookup3.c
similarity index 100%
rename from src/c/memory/lookup3.c
rename to archive/c/memory/lookup3.c
diff --git a/src/c/memory/lookup3.h b/archive/c/memory/lookup3.h
similarity index 100%
rename from src/c/memory/lookup3.h
rename to archive/c/memory/lookup3.h
diff --git a/src/c/memory/stack.c b/archive/c/memory/stack.c
similarity index 100%
rename from src/c/memory/stack.c
rename to archive/c/memory/stack.c
diff --git a/src/c/memory/stack.h b/archive/c/memory/stack.h
similarity index 100%
rename from src/c/memory/stack.h
rename to archive/c/memory/stack.h
diff --git a/src/c/memory/vectorspace.c b/archive/c/memory/vectorspace.c
similarity index 100%
rename from src/c/memory/vectorspace.c
rename to archive/c/memory/vectorspace.c
diff --git a/src/c/memory/vectorspace.h b/archive/c/memory/vectorspace.h
similarity index 100%
rename from src/c/memory/vectorspace.h
rename to archive/c/memory/vectorspace.h
diff --git a/src/c/ops/equal.c b/archive/c/ops/equal.c
similarity index 100%
rename from src/c/ops/equal.c
rename to archive/c/ops/equal.c
diff --git a/src/c/ops/equal.h b/archive/c/ops/equal.h
similarity index 100%
rename from src/c/ops/equal.h
rename to archive/c/ops/equal.h
diff --git a/src/c/ops/intern.c b/archive/c/ops/intern.c
similarity index 100%
rename from src/c/ops/intern.c
rename to archive/c/ops/intern.c
diff --git a/src/c/ops/intern.h b/archive/c/ops/intern.h
similarity index 100%
rename from src/c/ops/intern.h
rename to archive/c/ops/intern.h
diff --git a/src/c/ops/lispops.c b/archive/c/ops/lispops.c
similarity index 100%
rename from src/c/ops/lispops.c
rename to archive/c/ops/lispops.c
diff --git a/src/c/ops/lispops.h b/archive/c/ops/lispops.h
similarity index 100%
rename from src/c/ops/lispops.h
rename to archive/c/ops/lispops.h
diff --git a/src/c/ops/loop.c b/archive/c/ops/loop.c
similarity index 100%
rename from src/c/ops/loop.c
rename to archive/c/ops/loop.c
diff --git a/src/c/ops/loop.h b/archive/c/ops/loop.h
similarity index 100%
rename from src/c/ops/loop.h
rename to archive/c/ops/loop.h
diff --git a/src/c/ops/meta.c b/archive/c/ops/meta.c
similarity index 100%
rename from src/c/ops/meta.c
rename to archive/c/ops/meta.c
diff --git a/src/c/ops/meta.h b/archive/c/ops/meta.h
similarity index 100%
rename from src/c/ops/meta.h
rename to archive/c/ops/meta.h
diff --git a/src/c/repl.c b/archive/c/repl.c
similarity index 100%
rename from src/c/repl.c
rename to archive/c/repl.c
diff --git a/src/c/repl.h b/archive/c/repl.h
similarity index 100%
rename from src/c/repl.h
rename to archive/c/repl.h
diff --git a/src/c/time/psse_time.c b/archive/c/time/psse_time.c
similarity index 100%
rename from src/c/time/psse_time.c
rename to archive/c/time/psse_time.c
diff --git a/src/c/time/psse_time.h b/archive/c/time/psse_time.h
similarity index 100%
rename from src/c/time/psse_time.h
rename to archive/c/time/psse_time.h
diff --git a/src/c/utils.c b/archive/c/utils.c
similarity index 100%
rename from src/c/utils.c
rename to archive/c/utils.c
diff --git a/src/c/utils.h b/archive/c/utils.h
similarity index 100%
rename from src/c/utils.h
rename to archive/c/utils.h
diff --git a/src/c/version.h b/archive/c/version.h
similarity index 100%
rename from src/c/version.h
rename to archive/c/version.h
diff --git a/unit-tests/add.sh b/archive/unit-tests/add.sh
similarity index 100%
rename from unit-tests/add.sh
rename to archive/unit-tests/add.sh
diff --git a/unit-tests/allocation-tests/allocation-tester.sh b/archive/unit-tests/allocation-tests/allocation-tester.sh
similarity index 100%
rename from unit-tests/allocation-tests/allocation-tester.sh
rename to archive/unit-tests/allocation-tests/allocation-tester.sh
diff --git a/unit-tests/allocation-tests/allocation-tests.csv b/archive/unit-tests/allocation-tests/allocation-tests.csv
similarity index 100%
rename from unit-tests/allocation-tests/allocation-tests.csv
rename to archive/unit-tests/allocation-tests/allocation-tests.csv
diff --git a/archive/unit-tests/allocation-tests/allocation-tests.ods b/archive/unit-tests/allocation-tests/allocation-tests.ods
new file mode 100644
index 0000000..32a99d6
Binary files /dev/null and b/archive/unit-tests/allocation-tests/allocation-tests.ods differ
diff --git a/archive/unit-tests/allocation-tests/feature-2.test.tmp b/archive/unit-tests/allocation-tests/feature-2.test.tmp
new file mode 100644
index 0000000..5d198dd
--- /dev/null
+++ b/archive/unit-tests/allocation-tests/feature-2.test.tmp
@@ -0,0 +1,30 @@
+Case, Summary, Allocated, Deallocated, Not deallocated, Delta Allocated, Delta Deallocated, Delta Not Deallocated
+"Basecase", "Allocation summary allocated 19986 deallocated 245 not deallocated 19741", 19986, 245, 19741
+"", "Allocation summary allocated 19986 deallocated 245 not deallocated 19741", 19986, 245, 19741, 0, 0, 0
+"nil", "Allocation summary allocated 20019 deallocated 253 not deallocated 19766", 20019, 253, 19766, 33, 8, 25
+"()", "Allocation summary allocated 19990 deallocated 249 not deallocated 19741", 19990, 249, 19741, 4, 4, 0
+"(quote ())", "Allocation summary allocated 20025 deallocated 247 not deallocated 19778", 20025, 247, 19778, 39, 2, 37
+"(list)", "Allocation summary allocated 20023 deallocated 257 not deallocated 19766", 20023, 257, 19766, 37, 12, 25
+"(list )", "Allocation summary allocated 20023 deallocated 257 not deallocated 19766", 20023, 257, 19766, 37, 12, 25
+"(list 1)", "Allocation summary allocated 20033 deallocated 262 not deallocated 19771", 20033, 262, 19771, 47, 17, 30
+"(list 1 1)", "Allocation summary allocated 20043 deallocated 267 not deallocated 19776", 20043, 267, 19776, 57, 22, 35
+"(list 1 1 1)", "Allocation summary allocated 20053 deallocated 272 not deallocated 19781", 20053, 272, 19781, 67, 27, 40
+"(list 1 2 3)", "Allocation summary allocated 20053 deallocated 272 not deallocated 19781", 20053, 272, 19781, 67, 27, 40
+"(+)", "Allocation summary allocated 20022 deallocated 255 not deallocated 19767", 20022, 255, 19767, 36, 10, 26
+"(+ 1)", "Allocation summary allocated 20030 deallocated 260 not deallocated 19770", 20030, 260, 19770, 44, 15, 29
+"(+ 1 1)", "Allocation summary allocated 20039 deallocated 265 not deallocated 19774", 20039, 265, 19774, 53, 20, 33
+"(+ 1 1 1)", "Allocation summary allocated 20048 deallocated 270 not deallocated 19778", 20048, 270, 19778, 62, 25, 37
+"(+ 1 2 3)", "Allocation summary allocated 20048 deallocated 270 not deallocated 19778", 20048, 270, 19778, 62, 25, 37
+"(list 'a 'a 'a)", "Allocation summary allocated 20137 deallocated 278 not deallocated 19859", 20137, 278, 19859, 151, 33, 118
+"(list 'a 'b 'c)", "Allocation summary allocated 20137 deallocated 278 not deallocated 19859", 20137, 278, 19859, 151, 33, 118
+"(list :a :b :c)", "Allocation summary allocated 20107 deallocated 260 not deallocated 19847", 20107, 260, 19847, 121, 15, 106
+"(list :aa :bb :cc)", "Allocation summary allocated 20185 deallocated 260 not deallocated 19925", 20185, 260, 19925, 199, 15, 184
+"(list :aaa :bbb :ccc)", "Allocation summary allocated 20263 deallocated 260 not deallocated 20003", 20263, 260, 20003, 277, 15, 262
+"(list :alpha :bravo :charlie)", "Allocation summary allocated 20471 deallocated 260 not deallocated 20211", 20471, 260, 20211, 485, 15, 470
+"{}", "Allocation summary allocated 19992 deallocated 251 not deallocated 19741", 19992, 251, 19741, 6, 6, 0
+"{:z 0}", "Allocation summary allocated 20029 deallocated 257 not deallocated 19772", 20029, 257, 19772, 43, 12, 31
+"{:zero 0}", "Allocation summary allocated 20107 deallocated 257 not deallocated 19850", 20107, 257, 19850, 121, 12, 109
+"{:z 0 :o 1}", "Allocation summary allocated 20066 deallocated 261 not deallocated 19805", 20066, 261, 19805, 80, 16, 64
+"{:zero 0 :one 1}", "Allocation summary allocated 20196 deallocated 263 not deallocated 19933", 20196, 263, 19933, 210, 18, 192
+"{:z 0 :o 1 :t 2}", "Allocation summary allocated 20103 deallocated 265 not deallocated 19838", 20103, 265, 19838, 117, 20, 97
+"{:zero 0 :one 1 :two 2 :three 3 :four 4 :five five :six 6 :seven 7 :eight 8 :nine 9}", "Allocation summary allocated 21164 deallocated 306 not deallocated 20858", 21164, 306, 20858, 1178, 61, 1117
diff --git a/archive/unit-tests/allocation-tests/grep.bb b/archive/unit-tests/allocation-tests/grep.bb
new file mode 100755
index 0000000..23b187a
--- /dev/null
+++ b/archive/unit-tests/allocation-tests/grep.bb
@@ -0,0 +1,19 @@
+#!/home/simon/bin/bb
+
+(require '[clojure.java.io :as io])
+(import '[java.lang ProcessBuilder$Redirect])
+
+(defn grep [input pattern]
+  (let [proc (-> (ProcessBuilder. ["grep" pattern])
+                 (.redirectOutput ProcessBuilder$Redirect/INHERIT)
+                 (.redirectError ProcessBuilder$Redirect/INHERIT)
+                 (.start))
+        proc-input (.getOutputStream proc)]
+    (with-open [w (io/writer proc-input)]
+      (binding [*out* w]
+        (print input)
+        (flush)))
+    (.waitFor proc)
+    nil))
+
+(grep "hello\nbye\n" "e")
diff --git a/unit-tests/allocation-tests/test-forms b/archive/unit-tests/allocation-tests/test-forms
similarity index 100%
rename from unit-tests/allocation-tests/test-forms
rename to archive/unit-tests/allocation-tests/test-forms
diff --git a/unit-tests/append.sh b/archive/unit-tests/append.sh
similarity index 100%
rename from unit-tests/append.sh
rename to archive/unit-tests/append.sh
diff --git a/unit-tests/apply.sh b/archive/unit-tests/apply.sh
similarity index 100%
rename from unit-tests/apply.sh
rename to archive/unit-tests/apply.sh
diff --git a/archive/unit-tests/assoc.sh b/archive/unit-tests/assoc.sh
new file mode 100644
index 0000000..339c023
--- /dev/null
+++ b/archive/unit-tests/assoc.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+result=0
+
+expected='1'
+actual=`echo "(assoc 'foo '((foo . 1) (bar . 2) {ban 3 froboz 4 foo 5} (foobar . 6)))" | target/psse | tail -1`
+
+
+echo -n "$0 $1: assoc list binding... "
+
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=`echo "${result} + 1" | bc`
+fi
+
+expected='4'
+actual=`echo "(assoc 'froboz '((foo . 1) (bar . 2) {ban 3 froboz 4 foo 5} (foobar . 6)))" | target/psse | tail -1`
+
+
+echo -n "$0 $1: hashmap binding... "
+
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=`echo "${result} + 1" | bc`
+fi
+
+expected='nil'
+actual=`echo "(assoc 'ban '((foo . 1) (bar . 2) {ban nil froboz 4 foo 5} (foobar . 6) (ban . 7)))" | target/psse | tail -1`
+
+
+echo -n "$0 $1: key bound to 'nil' (1)... "
+
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=`echo "${result} + 1" | bc`
+fi
+
+expected='nil'
+actual=`echo "(assoc 'foo '((foo . nil) (bar . 2) {ban 3 froboz 4 foo 5} (foobar . 6)))" | target/psse | tail -1`
+
+
+echo -n "$0 $1: key bound to nil (2)... "
+
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=`echo "${result} + 1" | bc`
+fi
+
diff --git a/unit-tests/bignum-add.sh b/archive/unit-tests/bignum-add.sh
similarity index 100%
rename from unit-tests/bignum-add.sh
rename to archive/unit-tests/bignum-add.sh
diff --git a/unit-tests/bignum-expt.sh b/archive/unit-tests/bignum-expt.sh
similarity index 100%
rename from unit-tests/bignum-expt.sh
rename to archive/unit-tests/bignum-expt.sh
diff --git a/unit-tests/bignum-print.sh b/archive/unit-tests/bignum-print.sh
similarity index 100%
rename from unit-tests/bignum-print.sh
rename to archive/unit-tests/bignum-print.sh
diff --git a/unit-tests/bignum-subtract.sh b/archive/unit-tests/bignum-subtract.sh
similarity index 100%
rename from unit-tests/bignum-subtract.sh
rename to archive/unit-tests/bignum-subtract.sh
diff --git a/unit-tests/bignum.sh b/archive/unit-tests/bignum.sh
similarity index 100%
rename from unit-tests/bignum.sh
rename to archive/unit-tests/bignum.sh
diff --git a/unit-tests/complex-list.sh b/archive/unit-tests/complex-list.sh
similarity index 100%
rename from unit-tests/complex-list.sh
rename to archive/unit-tests/complex-list.sh
diff --git a/unit-tests/cond.sh b/archive/unit-tests/cond.sh
similarity index 100%
rename from unit-tests/cond.sh
rename to archive/unit-tests/cond.sh
diff --git a/unit-tests/empty-list.sh b/archive/unit-tests/empty-list.sh
similarity index 100%
rename from unit-tests/empty-list.sh
rename to archive/unit-tests/empty-list.sh
diff --git a/unit-tests/empty-string.sh b/archive/unit-tests/empty-string.sh
similarity index 100%
rename from unit-tests/empty-string.sh
rename to archive/unit-tests/empty-string.sh
diff --git a/unit-tests/equal.sh b/archive/unit-tests/equal.sh
similarity index 100%
rename from unit-tests/equal.sh
rename to archive/unit-tests/equal.sh
diff --git a/unit-tests/eval-integer.sh b/archive/unit-tests/eval-integer.sh
similarity index 100%
rename from unit-tests/eval-integer.sh
rename to archive/unit-tests/eval-integer.sh
diff --git a/unit-tests/eval-quote-sexpr.sh b/archive/unit-tests/eval-quote-sexpr.sh
similarity index 100%
rename from unit-tests/eval-quote-sexpr.sh
rename to archive/unit-tests/eval-quote-sexpr.sh
diff --git a/unit-tests/eval-quote-symbol.sh b/archive/unit-tests/eval-quote-symbol.sh
similarity index 100%
rename from unit-tests/eval-quote-symbol.sh
rename to archive/unit-tests/eval-quote-symbol.sh
diff --git a/unit-tests/eval-real.sh b/archive/unit-tests/eval-real.sh
similarity index 100%
rename from unit-tests/eval-real.sh
rename to archive/unit-tests/eval-real.sh
diff --git a/unit-tests/eval-string.sh b/archive/unit-tests/eval-string.sh
similarity index 100%
rename from unit-tests/eval-string.sh
rename to archive/unit-tests/eval-string.sh
diff --git a/unit-tests/fred.sh b/archive/unit-tests/fred.sh
similarity index 100%
rename from unit-tests/fred.sh
rename to archive/unit-tests/fred.sh
diff --git a/unit-tests/integer-allocation.sh b/archive/unit-tests/integer-allocation.sh
similarity index 100%
rename from unit-tests/integer-allocation.sh
rename to archive/unit-tests/integer-allocation.sh
diff --git a/unit-tests/integer.sh b/archive/unit-tests/integer.sh
similarity index 100%
rename from unit-tests/integer.sh
rename to archive/unit-tests/integer.sh
diff --git a/unit-tests/interpreter.sh b/archive/unit-tests/interpreter.sh
similarity index 100%
rename from unit-tests/interpreter.sh
rename to archive/unit-tests/interpreter.sh
diff --git a/unit-tests/lambda.sh b/archive/unit-tests/lambda.sh
similarity index 100%
rename from unit-tests/lambda.sh
rename to archive/unit-tests/lambda.sh
diff --git a/unit-tests/let.sh b/archive/unit-tests/let.sh
similarity index 100%
rename from unit-tests/let.sh
rename to archive/unit-tests/let.sh
diff --git a/unit-tests/list-test.sh b/archive/unit-tests/list-test.sh
similarity index 100%
rename from unit-tests/list-test.sh
rename to archive/unit-tests/list-test.sh
diff --git a/unit-tests/many-args.sh b/archive/unit-tests/many-args.sh
similarity index 100%
rename from unit-tests/many-args.sh
rename to archive/unit-tests/many-args.sh
diff --git a/unit-tests/map.sh b/archive/unit-tests/map.sh
similarity index 100%
rename from unit-tests/map.sh
rename to archive/unit-tests/map.sh
diff --git a/archive/unit-tests/mapcar.sh b/archive/unit-tests/mapcar.sh
new file mode 100644
index 0000000..70b41b0
--- /dev/null
+++ b/archive/unit-tests/mapcar.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+result=0
+
+#####################################################################
+# Create an empty map using map notation
+expected='(2 3 4)'
+actual=`echo "(mapcar (lambda (n) (+ n 1)) '(1 2 3))" | target/psse | tail -1`
+
+echo -n "$0: Mapping interpreted function across list: "
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=1
+fi
+
+#####################################################################
+# Create an empty map using make-map
+expected='("INTR" "REAL" "RTIO" "KEYW")'
+actual=`echo "(mapcar type '(1 1.0 1/2 :one))" | target/psse | tail -1`
+
+echo -n "$0: Mapping primitive function across list: "
+if [ "${expected}" = "${actual}" ]
+then
+    echo "OK"
+else
+    echo "Fail: expected '${expected}', got '${actual}'"
+    result=1
+fi
diff --git a/unit-tests/memberp.sh b/archive/unit-tests/memberp.sh
similarity index 100%
rename from unit-tests/memberp.sh
rename to archive/unit-tests/memberp.sh
diff --git a/unit-tests/memory.sh b/archive/unit-tests/memory.sh
similarity index 100%
rename from unit-tests/memory.sh
rename to archive/unit-tests/memory.sh
diff --git a/unit-tests/multiply.sh b/archive/unit-tests/multiply.sh
similarity index 100%
rename from unit-tests/multiply.sh
rename to archive/unit-tests/multiply.sh
diff --git a/unit-tests/nil.sh b/archive/unit-tests/nil.sh
similarity index 100%
rename from unit-tests/nil.sh
rename to archive/unit-tests/nil.sh
diff --git a/unit-tests/nlambda.sh b/archive/unit-tests/nlambda.sh
similarity index 100%
rename from unit-tests/nlambda.sh
rename to archive/unit-tests/nlambda.sh
diff --git a/unit-tests/path-notation.sh b/archive/unit-tests/path-notation.sh
similarity index 100%
rename from unit-tests/path-notation.sh
rename to archive/unit-tests/path-notation.sh
diff --git a/unit-tests/progn.sh b/archive/unit-tests/progn.sh
similarity index 100%
rename from unit-tests/progn.sh
rename to archive/unit-tests/progn.sh
diff --git a/unit-tests/quote.sh b/archive/unit-tests/quote.sh
similarity index 100%
rename from unit-tests/quote.sh
rename to archive/unit-tests/quote.sh
diff --git a/unit-tests/quoted-list.sh b/archive/unit-tests/quoted-list.sh
similarity index 100%
rename from unit-tests/quoted-list.sh
rename to archive/unit-tests/quoted-list.sh
diff --git a/unit-tests/ratio-addition.sh b/archive/unit-tests/ratio-addition.sh
similarity index 100%
rename from unit-tests/ratio-addition.sh
rename to archive/unit-tests/ratio-addition.sh
diff --git a/unit-tests/recursion.sh b/archive/unit-tests/recursion.sh
similarity index 100%
rename from unit-tests/recursion.sh
rename to archive/unit-tests/recursion.sh
diff --git a/unit-tests/reverse.sh b/archive/unit-tests/reverse.sh
similarity index 100%
rename from unit-tests/reverse.sh
rename to archive/unit-tests/reverse.sh
diff --git a/unit-tests/simple-list.sh b/archive/unit-tests/simple-list.sh
similarity index 100%
rename from unit-tests/simple-list.sh
rename to archive/unit-tests/simple-list.sh
diff --git a/unit-tests/slurp.sh b/archive/unit-tests/slurp.sh
similarity index 100%
rename from unit-tests/slurp.sh
rename to archive/unit-tests/slurp.sh
diff --git a/unit-tests/string-allocation.sh b/archive/unit-tests/string-allocation.sh
similarity index 100%
rename from unit-tests/string-allocation.sh
rename to archive/unit-tests/string-allocation.sh
diff --git a/unit-tests/string-cons.sh b/archive/unit-tests/string-cons.sh
similarity index 100%
rename from unit-tests/string-cons.sh
rename to archive/unit-tests/string-cons.sh
diff --git a/unit-tests/string-with-spaces.sh b/archive/unit-tests/string-with-spaces.sh
similarity index 100%
rename from unit-tests/string-with-spaces.sh
rename to archive/unit-tests/string-with-spaces.sh
diff --git a/unit-tests/subtract.sh b/archive/unit-tests/subtract.sh
similarity index 100%
rename from unit-tests/subtract.sh
rename to archive/unit-tests/subtract.sh
diff --git a/unit-tests/try.sh b/archive/unit-tests/try.sh
similarity index 100%
rename from unit-tests/try.sh
rename to archive/unit-tests/try.sh
diff --git a/unit-tests/varargs.sh b/archive/unit-tests/varargs.sh
similarity index 100%
rename from unit-tests/varargs.sh
rename to archive/unit-tests/varargs.sh
diff --git a/unit-tests/wide-character.sh b/archive/unit-tests/wide-character.sh
similarity index 100%
rename from unit-tests/wide-character.sh
rename to archive/unit-tests/wide-character.sh
diff --git a/docs/Paged-space-objects.md b/docs/Paged-space-objects.md
index 6885b70..8ecbd11 100644
--- a/docs/Paged-space-objects.md
+++ b/docs/Paged-space-objects.md
@@ -3,7 +3,7 @@
 *Antecedents for this essay:
 
 1. [Reference counting, and the garbage collection of equal sized objects](https://www.journeyman.cc/blog/posts-output/2013-08-25-reference-counting-and-the-garbage-collection-of-equal-sized-objects/);
-2. [Vector space, Pages, Mark-but-don't-sweep, and the world's slowest ever rapid prototype](https://www.journeyman.cc/blog/posts-output/2026-03-13-The-worlds-slowest-ever-rapid-prototype/).
+2. [Vector space, Pages, Mark-but-don't-sweep, and the world's slowest ever rapid prototype](https://www.journeyman.cc/blog/posts-output/2026-03-13-The-worlds-slowest-ever-rapid-prototype/).*
 
 The post-scarcity software environment needs to store data in objects. Much of the data will be in objects which will fit in the memory footpring ot a cons cell, but some won't, and those that won't will be in a variety of sizes. 
 
diff --git a/docs/State-of-play.md b/docs/State-of-play.md
index 55d9bab..ffa4e79 100644
--- a/docs/State-of-play.md
+++ b/docs/State-of-play.md
@@ -1,5 +1,29 @@
 # State of Play
 
+## 20260323
+
+I started an investigastion of the [Zig language](https://ziglang.org/) and 
+come away frustrated. It's definitely an interesting language, and *I think*
+one capable of doing what I want. But in trying to learn, I checked out 
+someone else's [Lisp interpreter in Zig](https://github.com/cryptocode/bio). 
+The last commit to this project is six months ago, so fairly current; project
+documentation is polished, implying the project is well advanced and by someone
+competent.
+
+It won't build.
+
+It won't build because there are breaking changes to the build system in the
+current version of Zig, and, according to helpful people on the Zig language
+Discord, breaking changes in Zig versions are quite frequent.
+
+Post-scarcity is a project which procedes slowly, and is very large indeed. I 
+will certainly not complete it before I die.
+
+I don't feel unstable tools are a good choice.
+
+I have, however, done more thinking about [Paged space objects], and think I
+now have a buildable specification.
+
 ## 20260319
 
 Right, the `member?` bug [is fixed](https://git.journeyman.cc/simon/post-scarcity/issues/11).