diff --git a/kiss/.haxerc b/kiss/.haxerc
deleted file mode 100644
index d5fb046d..00000000
--- a/kiss/.haxerc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "version": "4.3.0",
-  "resolveLibs": "scoped"
-}
\ No newline at end of file
diff --git a/kiss/README.md b/kiss/README.md
deleted file mode 100644
index c54d309f..00000000
--- a/kiss/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# Kiss
-
-*A type-safe, compiled Lisp for Haxe programs*
-
-[![Build Status](https://github.com/NQNStudios/kisslang/actions/workflows/test.yml/badge.svg)](https://github.com/NQNStudios/kisslang/actions/workflows/test.yml)
-
-## What is Kiss?
-
-Kiss is a work in progress. (See: [Who should use Kiss?](#who-should-use-kiss))
-
-Kiss aims to be a statically typed Lisp that runs correctly almost anywhere using Haxe's FFI features.
-
-**Main features:**
-
-- [x] Traditional Lisp macros
-- [x] Rust-style pattern-matching
-- [x] [Reader macros](https://gist.github.com/chaitanyagupta/9324402)
-- [x] Plug-and-play with every pure-Haxe library on Haxelib
-- [x] Smooth FFI with any non-Haxe library you can find or write Haxe bindings for
-- [x] helpful compiler errors
-
-**Extra goodies:**
-
-- [x] string interpolation
-- [x] Rust-style raw string literals
-- [x] syntactic sugar for Promise-based asynchronous code
-- [x] negative indexing
-- [x] list comprehensions
-- [x] immutability by default
-- [x] destructuring assignment
-
-## How does it work?
-
-Kiss
-
-* reads Kiss code from .kiss files
-* converts the Kiss expressions into [Haxe macro expressions](https://api.haxe.org/haxe/macro/Expr.html)
-* provides a [builder macro](https://haxe.org/manual/macro-type-building.html) which adds your Kiss functions to your Haxe classes before compiling
-
-By compiling into Haxe expressions, Kiss leverages all of the cross-target, cross-platform, type-safety, and null-safety features of the Haxe language.
-
-## Why?
-
-I've been working on a Haxe-based interpreted Lisp called [Hiss](https://github.com/hissvn/hiss) since December 2019. I had to rewrite Hiss from scratch at least once. I've learned so much from writing Hiss, but it has majorly slowed down the productivity of Hiss-based projects because it is so complex, fast-changing, and prone to runtime errors. Kiss is like a Kompiled hISS, and a reminder to Keep It Simple, Stupid.
-
-## What does the license mean?
-
-Licenses are confusing and GPL licenses can be intimidating. I've chosen the LGPL because I never want any big corporation to profit from my work. If you are an independent developer/studio with good intentions, I'm willing to negotiate usage of Kiss under a different license on a case-by-case basis.
-
-## Who should use Kiss?
-
-As of now:
-
-* Language design enthusiasts
-* Hobbyists writing **disposable** code without deadlines
-
-Hopefully someday:
-
-* Professional game developers who want to learn the ways of Lisp
-
-## Limitations
-
-* No pattern matching in macros
-* No type checking in macro definitions
-* Macros are extremely hard to debug
\ No newline at end of file
diff --git a/kiss/build-scripts/common-args.hxml b/kiss/build-scripts/common-args.hxml
deleted file mode 100644
index 9f3797a8..00000000
--- a/kiss/build-scripts/common-args.hxml
+++ /dev/null
@@ -1,11 +0,0 @@
--w -WUnusedPattern
--lib hscript
--lib uuid
--lib tink_macro
--lib tink_json
--lib tink_syntaxhub
--lib haxe-strings
--cp kiss/src
--cp cloner/src
--D analyzer-optimize
---macro kiss.KissFrontend.use()
\ No newline at end of file
diff --git a/kiss/build-scripts/common-test-args.hxml b/kiss/build-scripts/common-test-args.hxml
deleted file mode 100644
index 5abc7afa..00000000
--- a/kiss/build-scripts/common-test-args.hxml
+++ /dev/null
@@ -1,6 +0,0 @@
--lib utest
--D test
--D hscriptPos
--D var1ForCase=var1
--D var2ForCase=var2
---main test.TestMain
\ No newline at end of file
diff --git a/kiss/build-scripts/cpp/test-cpp.sh b/kiss/build-scripts/cpp/test-cpp.sh
deleted file mode 100755
index de641c46..00000000
--- a/kiss/build-scripts/cpp/test-cpp.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-./bin/cpp/test/TestMain
\ No newline at end of file
diff --git a/kiss/build-scripts/cpp/test.hxml b/kiss/build-scripts/cpp/test.hxml
deleted file mode 100644
index df7e0b3d..00000000
--- a/kiss/build-scripts/cpp/test.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--lib hxcpp
--cpp bin/cpp/test
--cmd bash kiss/build-scripts/cpp/test-cpp.sh
\ No newline at end of file
diff --git a/kiss/build-scripts/cs/test-cs.sh b/kiss/build-scripts/cs/test-cs.sh
deleted file mode 100755
index 64d417ee..00000000
--- a/kiss/build-scripts/cs/test-cs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-mono bin/cs/test/bin/TestMain.exe
\ No newline at end of file
diff --git a/kiss/build-scripts/cs/test.hxml b/kiss/build-scripts/cs/test.hxml
deleted file mode 100644
index a68aedef..00000000
--- a/kiss/build-scripts/cs/test.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--lib hxcs
--cs bin/cs/test
--cmd bash kiss/build-scripts/cs/test-cs.sh
\ No newline at end of file
diff --git a/kiss/build-scripts/dts2hx-externs/KillVersionReqs.hx b/kiss/build-scripts/dts2hx-externs/KillVersionReqs.hx
deleted file mode 100644
index babb6a4c..00000000
--- a/kiss/build-scripts/dts2hx-externs/KillVersionReqs.hx
+++ /dev/null
@@ -1,19 +0,0 @@
-package;
-
-import sys.io.File;
-import sys.FileSystem;
-import haxe.Json;
-
-class KillVersionReqs {
-    static function main() {
-        var libs = FileSystem.readDirectory("libs");
-        for (lib in libs) {
-            var haxelib = 'libs/$lib/$lib/haxelib.json';
-            var json = Json.parse(File.getContent(haxelib));
-            for (dependency => version in (json.dependencies : haxe.DynamicAccess<String>)) {
-                json.dependencies[dependency] = "";
-            }
-            File.saveContent(haxelib, Json.stringify(json)); 
-        }
-    }
-}
\ No newline at end of file
diff --git a/kiss/build-scripts/dts2hx-externs/regenerate.sh b/kiss/build-scripts/dts2hx-externs/regenerate.sh
deleted file mode 100755
index 769248bd..00000000
--- a/kiss/build-scripts/dts2hx-externs/regenerate.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/bash
-
-if [ -d libs ]; then
-    rm -rf libs
-fi
-
-if [ -d .haxelib ]; then
-    rm -rf .haxelib
-fi
-
-mkdir libs
-npm install .
-
-cd .haxelib
-
-libs=*
-for lib in $libs; do
-    mv $lib ../libs/$lib
-done
-    
-cd ..
-rm -rf .haxelib
-
-cd libs
-libs=*
-for lib in $libs; do
-    mv $lib/**/ $lib/$lib
-    haxelib dev $lib $lib/$lib/
-done
-cd ..
-cp $(haxelib libpath kiss)/build-scripts/dts2hx-externs/KillVersionReqs.hx ./
-haxe --main KillVersionReqs --interp
-rm KillVersionReqs.hx
\ No newline at end of file
diff --git a/kiss/build-scripts/interp/test.hxml b/kiss/build-scripts/interp/test.hxml
deleted file mode 100644
index 7aa3ac0f..00000000
--- a/kiss/build-scripts/interp/test.hxml
+++ /dev/null
@@ -1 +0,0 @@
---interp
\ No newline at end of file
diff --git a/kiss/build-scripts/js/test.hxml b/kiss/build-scripts/js/test.hxml
deleted file mode 100644
index eedcbcfa..00000000
--- a/kiss/build-scripts/js/test.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
---js bin/js/test.js
---cmd node bin/js/test.js
\ No newline at end of file
diff --git a/kiss/build-scripts/neko/test.hxml b/kiss/build-scripts/neko/test.hxml
deleted file mode 100644
index f14ed6a7..00000000
--- a/kiss/build-scripts/neko/test.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
--neko bin/neko/test.n
--cmd neko bin/neko/test.n
\ No newline at end of file
diff --git a/kiss/build-scripts/nodejs/test.hxml b/kiss/build-scripts/nodejs/test.hxml
deleted file mode 100644
index 2a197f12..00000000
--- a/kiss/build-scripts/nodejs/test.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--lib hxnodejs
---js bin/nodejs/test.js
---cmd node bin/nodejs/test.js
\ No newline at end of file
diff --git a/kiss/build-scripts/py/test-py.sh b/kiss/build-scripts/py/test-py.sh
deleted file mode 100755
index 4d1f8009..00000000
--- a/kiss/build-scripts/py/test-py.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-
-# "python" is supposed to mean Python3 everywhere now, but not in practice
-if [ ! -z "$(which python3)" ]; then
-    python3 bin/py/test.py
-else
-    python bin/py/test.py
-fi
\ No newline at end of file
diff --git a/kiss/build-scripts/py/test.hxml b/kiss/build-scripts/py/test.hxml
deleted file mode 100644
index 1989e692..00000000
--- a/kiss/build-scripts/py/test.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
---python bin/py/test.py
---cmd bash kiss/build-scripts/py/test-py.sh
\ No newline at end of file
diff --git a/kiss/build.hxml b/kiss/build.hxml
deleted file mode 100644
index 3ad992f4..00000000
--- a/kiss/build.hxml
+++ /dev/null
@@ -1,6 +0,0 @@
--cp src
--lib hscript
--lib uuid
--lib tink_macro
---main kiss.Main
---interp
\ No newline at end of file
diff --git a/kiss/extraParams.hxml b/kiss/extraParams.hxml
deleted file mode 100644
index 49311780..00000000
--- a/kiss/extraParams.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
--w -WUnusedPattern
---macro kiss.KissFrontend.use()
\ No newline at end of file
diff --git a/kiss/haxe_libraries/haxe-strings.hxml b/kiss/haxe_libraries/haxe-strings.hxml
deleted file mode 100644
index e5c6cbd9..00000000
--- a/kiss/haxe_libraries/haxe-strings.hxml
+++ /dev/null
@@ -1,5 +0,0 @@
-# @install: lix --silent download "haxelib:/haxe-strings#7.0.2" into haxe-strings/7.0.2/haxelib
--cp ${HAXE_LIBCACHE}/haxe-strings/7.0.2/haxelib/src/
--D haxe-strings=7.0.2
---macro hx.strings.internal.Macros.addDefines()
---macro hx.strings.internal.Macros.configureNullSafety()
diff --git a/kiss/haxe_libraries/hscript.hxml b/kiss/haxe_libraries/hscript.hxml
deleted file mode 100644
index 106e1f88..00000000
--- a/kiss/haxe_libraries/hscript.hxml
+++ /dev/null
@@ -1,5 +0,0 @@
-# @install: lix --silent download "haxelib:/hscript#2.5.0" into hscript/2.5.0/haxelib
-# @run: haxelib run-dir hscript "${HAXE_LIBCACHE}/hscript/2.5.0/haxelib"
--cp ${HAXE_LIBCACHE}/hscript/2.5.0/haxelib/
--D hscript=2.5.0
---macro keep('IntIterator')
\ No newline at end of file
diff --git a/kiss/haxe_libraries/tink_core.hxml b/kiss/haxe_libraries/tink_core.hxml
deleted file mode 100644
index 37a0d96a..00000000
--- a/kiss/haxe_libraries/tink_core.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
-# @install: lix --silent download "haxelib:/tink_core#2.1.0" into tink_core/2.1.0/haxelib
--cp ${HAXE_LIBCACHE}/tink_core/2.1.0/haxelib/src
--D tink_core=2.1.0
\ No newline at end of file
diff --git a/kiss/haxe_libraries/tink_json.hxml b/kiss/haxe_libraries/tink_json.hxml
deleted file mode 100644
index b167de7c..00000000
--- a/kiss/haxe_libraries/tink_json.hxml
+++ /dev/null
@@ -1,4 +0,0 @@
-# @install: lix --silent download "haxelib:/tink_json#0.11.0" into tink_json/0.11.0/haxelib
--lib tink_typecrawler
--cp ${HAXE_LIBCACHE}/tink_json/0.11.0/haxelib/src
--D tink_json=0.11.0
\ No newline at end of file
diff --git a/kiss/haxe_libraries/tink_macro.hxml b/kiss/haxe_libraries/tink_macro.hxml
deleted file mode 100644
index a9e19b1f..00000000
--- a/kiss/haxe_libraries/tink_macro.hxml
+++ /dev/null
@@ -1,4 +0,0 @@
-# @install: lix --silent download "haxelib:/tink_macro#1.0.1" into tink_macro/1.0.1/haxelib
--lib tink_core
--cp ${HAXE_LIBCACHE}/tink_macro/1.0.1/haxelib/src
--D tink_macro=1.0.1
\ No newline at end of file
diff --git a/kiss/haxe_libraries/tink_priority.hxml b/kiss/haxe_libraries/tink_priority.hxml
deleted file mode 100644
index 98cfa803..00000000
--- a/kiss/haxe_libraries/tink_priority.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--D tink_priority=0.1.3
-# @install: lix --silent download "gh://github.com/haxetink/tink_priority#ea736d31dc788aae703a2aa415c25d5b80d0e7d1" into tink_priority/0.1.3/github/ea736d31dc788aae703a2aa415c25d5b80d0e7d1
--cp ${HAXE_LIBCACHE}/tink_priority/0.1.3/github/ea736d31dc788aae703a2aa415c25d5b80d0e7d1/src
diff --git a/kiss/haxe_libraries/tink_syntaxhub.hxml b/kiss/haxe_libraries/tink_syntaxhub.hxml
deleted file mode 100644
index e3c7d2b2..00000000
--- a/kiss/haxe_libraries/tink_syntaxhub.hxml
+++ /dev/null
@@ -1,6 +0,0 @@
-# @install: lix --silent download "gh://github.com/haxetink/tink_syntaxhub#b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86" into tink_syntaxhub/0.6.0/github/b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86
--lib tink_macro
--lib tink_priority
--cp ${HAXE_LIBCACHE}/tink_syntaxhub/0.6.0/github/b6ea4966bbdee4d176ac8dd5d2d8ae3b362b2f86/src
--D tink_syntaxhub=0.6.0
---macro tink.SyntaxHub.use()
\ No newline at end of file
diff --git a/kiss/haxe_libraries/tink_typecrawler.hxml b/kiss/haxe_libraries/tink_typecrawler.hxml
deleted file mode 100644
index 373aee96..00000000
--- a/kiss/haxe_libraries/tink_typecrawler.hxml
+++ /dev/null
@@ -1,4 +0,0 @@
-# @install: lix --silent download "haxelib:/tink_typecrawler#0.7.0" into tink_typecrawler/0.7.0/haxelib
--lib tink_macro
--cp ${HAXE_LIBCACHE}/tink_typecrawler/0.7.0/haxelib/src
--D tink_typecrawler=0.7.0
\ No newline at end of file
diff --git a/kiss/haxe_libraries/uuid.hxml b/kiss/haxe_libraries/uuid.hxml
deleted file mode 100644
index ff1269ba..00000000
--- a/kiss/haxe_libraries/uuid.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
-# @install: lix --silent download "haxelib:/uuid#2.4.1" into uuid/2.4.1/haxelib
--cp ${HAXE_LIBCACHE}/uuid/2.4.1/haxelib/src
--D uuid=2.4.1
\ No newline at end of file
diff --git a/kiss/haxelib.json b/kiss/haxelib.json
deleted file mode 100644
index c1441600..00000000
--- a/kiss/haxelib.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "name": "kiss",
-    "url": "https://github.com/NQNStudios/kisslang",
-    "license": "LGPL",
-    "tags": ["cross"],
-    "description": "",
-    "version": "0.0.1",
-    "releasenote": "It isn't safe to use this library yet.",
-    "contributors": ["NQNStudios"],
-    "classPath": "src/",
-    "main": "kiss.Main",
-    "dependencies": {
-        "hscript": "",
-        "uuid": "",
-        "tink_macro": "",
-        "tink_json": "",
-        "tink_syntaxhub": "",
-        "haxe-strings": ""
-    }
-}
\ No newline at end of file
diff --git a/kiss/src/kiss/AsyncEmbeddedScript.hx b/kiss/src/kiss/AsyncEmbeddedScript.hx
deleted file mode 100644
index fca46882..00000000
--- a/kiss/src/kiss/AsyncEmbeddedScript.hx
+++ /dev/null
@@ -1,245 +0,0 @@
-package kiss;
-
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.PositionTools;
-import sys.io.File;
-import haxe.io.Path;
-using kiss.Helpers;
-#end
-
-import kiss.Kiss;
-import kiss.ReaderExp;
-import kiss.Prelude;
-import kiss.cloner.Cloner;
-using StringTools;
-
-typedef Continuation = () -> Void;
-typedef AsyncCommand = (AsyncEmbeddedScript, Continuation) -> Void;
-
-/**
-    Utility class for making statically typed, debuggable, ASYNC-BASED embedded Kiss-based DSLs.
-    Examples are in the hollywoo project.
-**/
-class AsyncEmbeddedScript {
-    private var instructions:Array<AsyncCommand> = null;
-    private var breakPoints:Map<Int, () -> Bool> = [];
-    private var onBreak:AsyncCommand = null;
-    private var lastInstructionPointer = -1;
-    private var labels:Map<String,Int> = [];
-    private var noSkipInstructions:Map<Int,Bool> = [];
-
-    public function setBreakHandler(handler:AsyncCommand) {
-        onBreak = handler;
-    }
-
-    public function addBreakPoint(instruction:Int, ?condition:() -> Bool) {
-        if (condition == null) {
-            condition = () -> true;
-        }
-        breakPoints[instruction] = condition;
-    }
-
-    public function removeBreakPoint(instruction:Int) {
-        breakPoints.remove(instruction);
-    }
-
-    public function new() {}
-
-    private function resetInstructions() {}
-
-    public function instructionCount() { 
-        if (instructions == null)
-            resetInstructions();
-        return instructions.length;
-    }
-
-    private function runInstruction(instructionPointer:Int, withBreakPoints = true) {
-        lastInstructionPointer = instructionPointer;
-        if (instructions == null)
-            resetInstructions();
-        if (withBreakPoints && breakPoints.exists(instructionPointer) && breakPoints[instructionPointer]()) {
-            if (onBreak != null) {
-                onBreak(this, () -> runInstruction(instructionPointer, false));
-            }
-        }
-        var continuation = if (instructionPointer < instructions.length - 1) {
-            () -> {
-                // runInstruction may be called externally to skip through the script.
-                // When this happens, make sure other scheduled continuations are canceled
-                // by verifying that lastInstructionPointer hasn't changed
-                if (lastInstructionPointer == instructionPointer) {
-                    runInstruction(instructionPointer + 1);
-                }
-            };
-        } else {
-            () -> {};
-        }
-        instructions[instructionPointer](this, continuation);
-    }
-
-    public function run(withBreakPoints = true) {
-        runInstruction(0, withBreakPoints);
-    }
-
-    private function skipToInstruction(ip:Int) {
-        var lastCC = ()->runInstruction(ip);
-        // chain together the unskippable instructions prior to running the requested ip
-        var noSkipList = [];
-        for (cIdx in lastInstructionPointer+1... ip) {
-            if (noSkipInstructions.exists(cIdx)) {
-                noSkipList.push(cIdx);
-            }
-        }
-        if (noSkipList.length > 0) {
-            var cc = null;
-            cc = ()->{
-                if (noSkipList.length == 0) {
-                    lastCC();
-                } else {
-                    var inst = noSkipList.shift();
-                    lastInstructionPointer = inst;
-                    instructions[inst](this, cc);
-                }
-            };
-            cc();
-        } else {
-            lastCC();
-        }
-
-        // TODO remember whether breakpoints were requested
-    }
-
-    public function skipToNextLabel() {
-        var labelPointers = [for (ip in labels) ip];
-        labelPointers.sort(Reflect.compare);
-        for (ip in labelPointers) {
-            if (ip > lastInstructionPointer) {
-                skipToInstruction(ip);
-                break;
-            }
-        }
-    }
-
-    public function skipToLabel(name:String) {
-        var ip = labels[name];
-        if (lastInstructionPointer > ip) {
-            throw "Rewinding AsyncEmbeddedScript is not implemented";
-        }
-        skipToInstruction(ip);
-    }
-
-    public function labelRunners():Map<String,Void->Void> {
-        return [for (label => ip in labels) label => () -> skipToInstruction(ip)];
-    }
-
-    #if macro
-    public static function build(dslHaxelib:String, dslFile:String, scriptFile:String):Array<Field> {
-        // trace('AsyncEmbeddedScript.build $dslHaxelib $dslFile $scriptFile');
-        var k = Kiss.defaultKissState();
-
-        k.file = scriptFile;
-        var classPath = Context.getPosInfos(Context.currentPos()).file;
-        var loadingDirectory = Path.directory(classPath);
-        var classFields = []; // Kiss.build() will already include Context.getBuildFields()
-
-        var commandList:Array<Expr> = [];
-        var labelsList:Array<Expr> = [];
-        var noSkipList:Array<Expr> = [];
-
-        var labelNum = 0;
-        k.macros["label"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            wholeExp.checkNumArgs(1, 1, '(label <label>)');
-            var label = Prelude.symbolNameValue(args[0]);
-            label = '${++labelNum}. '.lpad("0", 5) + label;
-            labelsList.push(macro labels[$v{label}] = $v{commandList.length});
-            
-            wholeExp.expBuilder().callSymbol("cc", []);
-        };
-
-        k.macros["noSkip"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            wholeExp.checkNumArgs(1, null, '(noSkip <body...>)');
-            noSkipList.push(macro noSkipInstructions[$v{commandList.length}] = true);
-
-            wholeExp.expBuilder().begin(args);
-        }
-
-        if (dslHaxelib.length > 0) {
-            dslFile = Path.join([Prelude.libPath(dslHaxelib), dslFile]);
-        }
-
-        // This brings in the DSL's functions and global variables.
-        // As a side-effect, it also fills the KissState with the macros and reader macros that make the DSL syntax
-        classFields = classFields.concat(Kiss.build(dslFile, k));
-
-        scriptFile = Path.join([loadingDirectory, scriptFile]);
-        k.fieldList = [];
-        Kiss._try(() -> {
-            #if profileKiss
-            Kiss.measure('Compiling kiss: $scriptFile', () -> {
-            #end
-                function process(nextExp) {
-                    nextExp = Kiss.macroExpand(nextExp, k);
-                    
-                    // Allow packing multiple commands into one exp with a (commands <...>) statement
-                    switch (nextExp.def) {
-                        case CallExp({pos: _, def: Symbol("commands")}, 
-                        commands):
-                            for (exp in commands) {
-                                process(exp);
-                            }
-                            return;
-                        default:
-                    }
-                    
-                    var exprString = Reader.toString(nextExp.def);
-                    var expr = Kiss.readerExpToHaxeExpr(nextExp, k);
-                    if (Kiss.isEmpty(expr))
-                        return;
-                    #if debug
-                    expr = macro { Prelude.print($v{exprString}); $expr; };
-                    expr = expr.expr.withMacroPosOf(nextExp);
-                    #end
-                    if (expr != null) {
-                        var c = macro function(self, cc) {
-                            $expr;
-                        };
-                        commandList.push(c.expr.withMacroPosOf(nextExp));
-                    }
-
-                    // This return is essential for type unification of concat() and push() above... ugh.
-                    return;
-                }
-                Reader.readAndProcess(Stream.fromFile(scriptFile), k, process);
-                null;
-            #if profileKiss
-            });
-            #end
-        });
-
-        classFields = classFields.concat(k.fieldList);
-
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "resetInstructions",
-            access: [APrivate, AOverride],
-            kind: FFun({
-                ret: null,
-                args: [],
-                expr: macro {
-                    this.instructions = [$a{commandList}];
-                    $b{labelsList};
-                    $b{noSkipList};
-                }
-            })
-        });
-
-        return classFields;
-    }
-    #end
-}
diff --git a/kiss/src/kiss/ByteStream.hx b/kiss/src/kiss/ByteStream.hx
deleted file mode 100644
index e4de5f6b..00000000
--- a/kiss/src/kiss/ByteStream.hx
+++ /dev/null
@@ -1,109 +0,0 @@
-package kiss;
-
-import sys.io.File;
-import haxe.io.Bytes;
-
-using StringTools;
-
-class ByteStream {
-    var bytes = Bytes.alloc(0);
-    var position = 0;
-    var file = "";
-    function new () {}
-
-    function posToPrint(?pos:Int) {
-        if (pos == null) pos = position;
-        return 'position $pos (0x${pos.hex()})';
-    }
-
-    public static function fromFile(file) {
-        var s = new ByteStream();
-        s.bytes = File.getBytes(file);
-        s.file = file;
-        return s;
-    }
-
-    public function readByte():Int {
-        return bytes.get(position++);
-    }
-
-    public function readInt32():Int {
-        var int = bytes.getInt32(position);
-        position += 4;
-        return int;
-    }
-
-    public function readUInt32():Int {
-        var int = readInt32();
-        return if (int < 0) cast (4294967296 + cast int) else int; 
-    }
-
-    public function readUInt16():Int {
-        var int = bytes.getUInt16(position);
-        position += 2;
-        return int;
-    }
-
-    // Read a C-style 0-terminated ascii string
-    public function readCString(maxLength = 0):String {
-        var string = "";
-        var pos = position;
-        var _maxBytes = if (maxLength <= 0) bytes.length - position else maxLength + 1; // TODO test this for off-by-one error
-        for (idx in 0..._maxBytes) {
-            var next = readByte();
-            if (next == 0) {
-                if (maxLength > 0)
-                    paddingBytes(_maxBytes - idx - 1);
-                return string;
-            }
-            else string += String.fromCharCode(next);
-        }
-        if (maxLength <= 0) {
-            throw 'C String starting at ${posToPrint()} in $file ends in unexpected EOF';
-        } else {
-            throw 'C String starting at ${posToPrint()} in $file is longer than $maxLength bytes: $string';
-        }
-    }
-
-    public function skipZeros() {
-        while (readByte() == 0) {}
-        
-        position--;
-    }
-
-    public function unknownBytes(num:Int) {
-        var startPos = position;
-        paddingBytes(num, true);
-        var hexString = [for (p in collectedPadding) p.hex(2)].join(" ");
-        trace('Warning: ignoring $num unknown bytes starting at ${posToPrint(startPos)} in $file: $collectedPadding ($hexString)');
-    }
-
-    var collectedPadding:Array<Int> = [];
-    public function paddingBytes(num, collect=false) {
-        if (collect)
-            collectedPadding = [for (_ in 0...num) readByte()];
-        else
-            for (_ in 0...num) readByte();
-    }
-
-    public function paddingUntil(pos:String, collect=false) {
-        var nextPos = Std.parseInt(pos);
-        var startPos = position;
-        if (nextPos <= position) {
-            throw 'given position $pos ($nextPos) is <= stream ${posToPrint()} in $file';
-        }
-        paddingBytes(nextPos - position, collect);
-        return nextPos - startPos;
-    }
-
-    public function unknownUntil(pos:String) {
-        var startPos = position;
-        var num = paddingUntil(pos, true);
-        var hexString = [for (p in collectedPadding) p.hex(2)].join(" ");
-        trace('Warning: ignoring $num unknown bytes starting at ${posToPrint(startPos)} in $file: $collectedPadding ($hexString)');
-    }
-
-    public function tracePosition() {
-        trace('$file: ${posToPrint()}');
-    }
-}
diff --git a/kiss/src/kiss/CompilerTools.hx b/kiss/src/kiss/CompilerTools.hx
deleted file mode 100644
index 5aa26507..00000000
--- a/kiss/src/kiss/CompilerTools.hx
+++ /dev/null
@@ -1,259 +0,0 @@
-package kiss;
-
-#if macro
-import kiss.KissError;
-import kiss.Kiss;
-import kiss.Helpers;
-import sys.FileSystem;
-import sys.io.File;
-import haxe.io.Path;
-import haxe.macro.Expr;
-import haxe.macro.Context;
-
-using StringTools;
-using haxe.io.Path;
-
-enum CompileLang {
-    JavaScript;
-    Python;
-}
-
-typedef CompilationArgs = {
-    // path to a folder where the script will be compiled
-    ?outputFolder:String,
-    // path to a file with hxml args in it (SHOULD NOT specify target or main class)
-    ?hxmlFile:String,
-    // whether to skip haxelib install all --always
-    ?skipHaxelibInstall:Bool,
-    // path to a package.json, requirements.txt, or setup.py file
-    ?langProjectFile:String,
-    // paths to extra files to copy
-    ?extraFiles:Array<String>
-}
-
-/**
- * Multi-purpose tools for compiling Kiss projects.
- */
-class CompilerTools {
-    /**
-     * Compile a kiss file into a standalone script.
-     * @return An expression of a function that, when called, executes the script and returns the script output as a string.
-     */
-    public static function compileFileToScript(kissFile:String, lang:CompileLang, args:CompilationArgs):Expr {
-        var k = Kiss.defaultKissState();
-        var beginExpsInFile = Kiss.load(kissFile, k, "", true);
-        return compileToScript([beginExpsInFile], lang, args);
-    }
-
-    /**
-     * Compile kiss expressions into a standalone script
-     * @return An expression of a function that, when called, executes the script and returns the script output as a string.
-     */
-    public static function compileToScript(exps:Array<ReaderExp>, lang:CompileLang, args:CompilationArgs, ?sourceExp:ReaderExp):Expr {
-        var handleError = (error) -> {
-            var error = 'External compilation error: $error';
-            if (sourceExp != null) {
-                throw KissError.fromExp(sourceExp, error);
-            } else {
-                throw new KissError(exps, error);
-            }
-        }
-
-        if (args.outputFolder == null) {
-            args.outputFolder = Path.join(["bin", '_kissScript${nextAnonymousScriptId++}']);
-        }
-
-        // if folder exists, delete it
-        // TODO this assumes the user hasn't put folders in the folder, which
-        // would cause a failure because we're not deleting recursively
-        if (FileSystem.exists(args.outputFolder)) {
-            Prelude.walkDirectory(null, args.outputFolder, (file) -> FileSystem.deleteFile(file), null, (folder) -> FileSystem.deleteDirectory(folder));
-            FileSystem.deleteDirectory(args.outputFolder);
-        }
-
-        // create it again
-        FileSystem.createDirectory(args.outputFolder);
-
-        // Find the haxelib folder of the class compiling a script (trickier than it should be):
-        var module = Context.getLocalModule();
-        var moduleFile = module.replace(".", "/") + ".hx";
-        var fullFile = Context.getPosInfos(Context.currentPos()).file.replace("\\", "/");
-        var classPath = fullFile.replace(moduleFile, "");
-        var classPathFolders = classPath.split("/");
-        while (classPathFolders.length > 0) {
-            try {
-                Prelude.libPath(classPathFolders[classPathFolders.length - 1]);
-                break;
-            } catch (e) {
-                classPathFolders.pop();
-            }
-        }
-        if (classPathFolders.length == 0) {
-            handleError('compileToScript called by file $moduleFile which is not in a haxelib folder');
-        }
-        var haxelibPath = classPathFolders.join("/");
-
-        function copyToFolder(file, ?libPath) {
-            if (libPath == null) {
-                libPath = haxelibPath;
-            }
-
-            File.copy(Path.join([libPath, file]), Path.join([args.outputFolder, file.withoutDirectory()]));
-        }
-
-        // Copy all files in that don't need to be processed in some way
-        if (args.extraFiles == null) {
-            args.extraFiles = [];
-        }
-        for (file in [args.hxmlFile, args.langProjectFile].concat(args.extraFiles)) {
-            if (file != null) {
-                copyToFolder(file);
-            }
-        }
-
-        var haxelibSetupOutput = Prelude.tryProcess("haxelib", ["setup"], handleError, [""]);
-        var messageBeforePath = "haxelib repository is now ";
-        var haxelibRepositoryPath = haxelibSetupOutput.substr(haxelibSetupOutput.indexOf(messageBeforePath)).replace(messageBeforePath, "");
-
-        var mainHxFile = "ExternMain.hx";
-        copyToFolder(mainHxFile, Path.join([Prelude.libPath("kiss"), "src", "kiss"]));
-
-        var mainClassName = mainHxFile.withoutDirectory().withoutExtension();
-
-        // make the kiss file just the given expressions dumped into a file,
-        // with a corresponding name to the mainClassName
-        var kissFileContent = "";
-        for (exp in exps) {
-            kissFileContent += Reader.toString(exp.def) + "\n";
-        }
-        File.saveContent(Path.join([args.outputFolder, 'ScriptMain.kiss']), kissFileContent);
-
-        // generate build.hxml
-        var buildHxmlContent = "";
-        buildHxmlContent += "-lib kiss\n";
-        buildHxmlContent += '--main $mainClassName\n';
-        switch (lang) {
-            case JavaScript:
-                // Throw in hxnodejs because we know node will be running the script:
-                buildHxmlContent += '-lib hxnodejs\n';
-                buildHxmlContent += '-js $mainClassName.js\n';
-            case Python:
-                buildHxmlContent += '-python $mainClassName.py\n';
-        }
-        var buildHxmlFile = Path.join([args.outputFolder, 'build.hxml']);
-        File.saveContent(buildHxmlFile, buildHxmlContent);
-
-        // install language-specific dependencies from langProjectFile (which might be tricky because we can't set the working directory)
-        var command = "";
-        var scriptExt = "";
-        switch (lang) {
-            case JavaScript:
-                command = "node";
-                scriptExt = "js";
-                // npm install outputfolder
-                if (args.langProjectFile != null) {
-                    // This can only be done in the current working directory, so the project file needs to be moved here
-                    // Move existing package.json, package-lock.json, node_modules out of the way:
-                    function move(file, newName) {
-                        if (FileSystem.exists(file)) {
-                            FileSystem.rename(file, newName);
-                        }
-                    }
-
-                    // Special handling for dts2hx bindings after a finished or failed npm build:
-                    function clearDotHaxelib() {
-                        if (FileSystem.exists(".haxelib")) {
-                            for (externLib in FileSystem.readDirectory(".haxelib")) {
-                                if (FileSystem.exists(Prelude.joinPath(haxelibRepositoryPath, externLib))) {
-                                    Prelude.purgeDirectory(Prelude.joinPath(haxelibRepositoryPath, externLib));
-                                }
-                                move(Prelude.joinPath(".haxelib", externLib), Prelude.joinPath(haxelibRepositoryPath, externLib));
-                            }
-                            Prelude.purgeDirectory(".haxelib");
-                        }
-                    }
-
-                    // TODO it's possible that moving .haxelib here would solve
-                    // the problem Yvon found, but it's also possible that code
-                    // would fail to compile if haxelib dependencies aren't
-                    // where they're expected at arbitrary times during compilation
-                    move("package.json", "package.json.temp");
-                    move("package-lock.json", "package-lock.json.temp");
-                    move("node_modules", "node_modules.temp");
-
-                    File.copy(Path.join([haxelibPath, args.langProjectFile]), "package.json");
-
-                    var oldHandleError = handleError;
-                    handleError = (error) -> {
-                        clearDotHaxelib();   
-                        oldHandleError(error);
-                    }
-                    if (Sys.systemName() == "Windows") {
-                        Prelude.tryProcess("cmd.exe", ["/c", 'npm', 'install'], handleError);
-                    } else {
-                        Prelude.tryProcess("npm", ['install'], handleError);
-                    }
-
-                    FileSystem.deleteFile("package.json");
-                    move("node_modules", Prelude.joinPath(args.outputFolder, "node_modules"));
-                    move("package-lock.json", Prelude.joinPath(args.outputFolder, "package-lock.json"));
-                    
-                    clearDotHaxelib();
-
-                    move("package.json.temp", "package.json");
-                    move("package-lock.json.temp", "package-lock.json");
-                    move("node_modules.temp", "node_modules");
-                }
-            case Python:
-                command = "python";
-                scriptExt = "py";
-                if (args.langProjectFile != null) {
-                    // Make a virtual environment
-                    // NOTE this is placed outside the output folder, so it will get reused.
-                    // In some cases this might be bad if the virtual environment gets bad
-                    // versions of dependencies stuck in it
-                    var envFolder = '${args.outputFolder}-env';
-                    Prelude.tryProcess("python", ["-m", "venv", envFolder], handleError);
-                    var envBinDir = if (Sys.systemName() == "Windows") "Scripts" else "bin";
-                    // trace(Prelude.assertProcess("ls", [envFolder]).replace("\n", " "));
-                    // trace(Prelude.assertProcess("ls", [Path.join([envFolder, envBinDir])]).replace("\n", " "));
-                    var envPython = Path.join([envFolder, envBinDir, "python"]);
-                    command = envPython;
-                    switch (args.langProjectFile.extension()) {
-                        case "txt":
-                            // the requirements file's original path is fine for this case
-                            Prelude.tryProcess(envPython, ["-m", "pip", "install", "-r", Path.join([haxelibPath, args.langProjectFile])], handleError);
-                        case "py":
-                            // python setup.py install
-                            envPython = '../${envFolder.withoutDirectory()}/bin/python';
-                            if (Sys.systemName() == 'Windows')
-                                envPython = envPython.replace('/', '\\');
-                            Prelude.tryProcess(envPython, [args.langProjectFile.withoutDirectory(), "install"], handleError, args.outputFolder);
-                    }
-                }
-        }
-
-        // run haxelib install on given hxml and generated hxml
-        var hxmlFiles = [buildHxmlFile];
-        Prelude.tryProcess("haxelib", ["install", "--always", buildHxmlFile], handleError);
-        if (args.hxmlFile != null) {
-            if (args.skipHaxelibInstall == null || !args.skipHaxelibInstall) {
-                Prelude.tryProcess("haxelib", ["install", "--always", Path.join([haxelibPath, args.hxmlFile])], handleError);
-            }
-            hxmlFiles.push(args.hxmlFile);
-        }
-
-        // Compile the script
-        Prelude.tryProcess("haxe", ["--cwd", args.outputFolder].concat(hxmlFiles.map(Path.withoutDirectory)), handleError);
-
-        // return an expression for a lambda that calls new Process() that runs the target-specific file
-        var callingCode = 'function (?inputLines:Array<String>) { if (inputLines == null) inputLines = []; return kiss.Prelude.assertProcess("$command", [haxe.io.Path.join(["${args.outputFolder}", "$mainClassName.$scriptExt"])].concat(inputLines)); }';
-        #if test
-        trace(callingCode);
-        #end
-        return Context.parse(callingCode, Context.currentPos());
-    }
-
-    static var nextAnonymousScriptId = 0;
-}
-#end
diff --git a/kiss/src/kiss/EmbeddedScript.hx b/kiss/src/kiss/EmbeddedScript.hx
deleted file mode 100644
index 78c28a53..00000000
--- a/kiss/src/kiss/EmbeddedScript.hx
+++ /dev/null
@@ -1,242 +0,0 @@
-package kiss;
-
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.PositionTools;
-import sys.io.File;
-import haxe.io.Path;
-using kiss.Helpers;
-#end
-import kiss.Kiss;
-import kiss.cloner.Cloner;
-
-// Commands handlers accept a Dynamic argument because when fork() happens
-// (1) the calling context can no longer assume the instance it constructed is the instance running the command.
-// (2) I don't know how to put a generic parameter <T extends EmbeddedScript> on the Command typedef.
-typedef Command = (Dynamic) -> Void;
-
-/**
-    Utility class for making statically typed, debuggable, embedded Kiss-based DSLs.
-    Basic examples:
-        kiss/src/test/cases/DSLTestCase.hx
-        projects/aoc/year2020/BootCode.hx
-**/
-class EmbeddedScript {
-    public var instructionPointer(default, null) = 0;
-
-    var running = false;
-
-    private var instructions:Array<Command> = null;
-    private var breakPoints:Map<Int, () -> Bool> = [];
-    private var onBreak:Command = null;
-
-    public function setBreakHandler(handler:Command) {
-        onBreak = handler;
-    }
-
-    public function addBreakPoint(instruction:Int, ?condition:() -> Bool) {
-        if (condition == null) {
-            condition = () -> true;
-        }
-        breakPoints[instruction] = condition;
-    }
-
-    public function removeBreakPoint(instruction:Int) {
-        breakPoints.remove(instruction);
-    }
-
-    public function new() {}
-
-    #if macro
-    public static function build(dslFile:String, scriptFile:String):Array<Field> {
-        var k = Kiss.defaultKissState();
-        k.file = scriptFile;
-
-        var classPath = Context.getPosInfos(Context.currentPos()).file;
-        var loadingDirectory = Path.directory(classPath);
-        var classFields = []; // Kiss.build() will already include Context.getBuildFields()
-
-        var commandList:Array<Expr> = [];
-
-        // This brings in the DSL's functions and global variables.
-        // As a side-effect, it also fills the KissState with the macros and reader macros that make the DSL syntax
-        classFields = classFields.concat(Kiss.build(dslFile, k));
-        scriptFile = Path.join([loadingDirectory, scriptFile]);
-
-        Kiss._try(() -> {
-            #if profileKiss
-            Kiss.measure('Compiling kiss: $scriptFile', () -> {
-            #end
-                Reader.readAndProcess(Stream.fromFile(scriptFile), k, (nextExp) -> {
-                    var expr = Kiss.readerExpToHaxeExpr(nextExp, k);
-
-                    if (expr != null) {
-                        var c = macro function(self) {
-                            $expr;
-                        };
-                        commandList.push(c.expr.withMacroPosOf(nextExp));
-                    }
-
-                    // This return is essential for type unification of concat() and push() above... ugh.
-                    return;
-                    // TODO also allow label setting and multiple commands coming from the same expr?
-                    // Multiple things could come from the same expr by returning begin, or a call to a function that does more stuff
-                    // i.e. knot declarations need to end the previous knot, and BELOW that set a label for the new one, then increment the read count
-                    // TODO test await
-                });
-                null;
-            #if profileKiss
-            });
-            #end
-        });
-
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "resetInstructions",
-            access: [APrivate],
-            kind: FFun({
-                ret: null,
-                args: [],
-                expr: macro this.instructions = [$a{commandList}]
-            })
-        });
-
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "instructionCount",
-            access: [APublic],
-            kind: FFun({
-                ret: null,
-                args: [],
-                expr: macro {
-                    if (instructions == null)
-                        resetInstructions();
-                    return instructions.length;
-                }
-            })
-        });
-
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "step",
-            access: [APublic],
-            kind: FFun({
-                ret: null,
-                args: [],
-                expr: macro {
-                    if (instructions == null)
-                        resetInstructions();
-                    instructions[instructionPointer](this);
-                    ++instructionPointer;
-                    if (breakPoints.exists(instructionPointer) && breakPoints[instructionPointer]()) {
-                        running = false;
-                        if (onBreak != null) {
-                            onBreak(this);
-                        }
-                    } else if (instructionPointer < 0 || instructionPointer >= instructions.length) {
-                        running = false;
-                    }
-                }
-            })
-        });
-
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "run",
-            access: [APublic],
-            kind: FFun({
-                ret: null,
-                args: [],
-                expr: macro {
-                    running = true;
-                    while (running) {
-                        step();
-                    }
-                }
-            })
-        });
-
-        // Start a process that needs to take control of the main thread, and will call back to resume the script
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "await",
-            access: [APublic],
-            kind: FFun({
-                ret: null,
-                args: [
-                    {
-                        type: Helpers.parseComplexType("(()->Void)->Void", null),
-                        name: "c"
-                    }
-                ],
-                expr: macro {
-                    running = false;
-                    c(run);
-                }
-            })
-        });
-
-        // Fork the script down two or more different commands.
-        classFields.push({
-            pos: PositionTools.make({
-                min: 0,
-                max: File.getContent(scriptFile).length,
-                file: scriptFile
-            }),
-            name: "fork",
-            access: [APublic],
-            kind: FFun({
-                ret: Helpers.parseComplexType("Array<EmbeddedScript>", null),
-                args: [
-                    {
-                        type: Helpers.parseComplexType("Array<Command>", null),
-                        name: "commands"
-                    }
-                ],
-                expr: macro {
-                    if (instructions == null)
-                        resetInstructions();
-                    return [
-                        for (command in commands) {
-                            // a fork needs to be a thorough copy that includes all of the EmbeddedScript subclass's
-                            // fields, otherwise DSL state will be lost when forking, which is unacceptable
-                            var fork = new kiss.cloner.Cloner().clone(this);
-                            fork.instructions[instructionPointer] = command;
-                            if (fork.breakPoints == null) {
-                                // This field is so much trouble to clone in C# because of its type
-                                fork.breakPoints = [for (point => condition in this.breakPoints) point => condition];
-                            }
-                            // trace('running a fork from ' + Std.string(instructionPointer + 1));
-                            fork.run();
-                            // trace("fork finished");
-                            fork;
-                        }
-                    ];
-                }
-            })
-        });
-        return classFields;
-    }
-    #end
-}
diff --git a/kiss/src/kiss/ExternMain.hx b/kiss/src/kiss/ExternMain.hx
deleted file mode 100644
index 0b2987e4..00000000
--- a/kiss/src/kiss/ExternMain.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package;
-
-class ExternMain {
-    static function main() {
-        ScriptMain.main();
-    }
-}
diff --git a/kiss/src/kiss/FieldForms.hx b/kiss/src/kiss/FieldForms.hx
deleted file mode 100644
index 23bcc217..00000000
--- a/kiss/src/kiss/FieldForms.hx
+++ /dev/null
@@ -1,191 +0,0 @@
-package kiss;
-
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import kiss.Reader;
-import kiss.ReaderExp;
-import kiss.Helpers;
-import kiss.Stream;
-import kiss.KissError;
-import kiss.Kiss;
-
-using kiss.Kiss;
-using kiss.Helpers;
-using kiss.Reader;
-using StringTools;
-
-// Field forms convert Kiss reader expressions into Haxe macro class fields
-typedef FieldFormFunction = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> Field;
-
-class FieldForms {
-    public static function addBuiltins(k:KissState) {
-        var map:Map<String, FieldFormFunction> = [];
-
-        function renameAndDeprecate(oldName:String, newName:String) {
-            var form = map[oldName];
-            map[oldName] = (wholeExp, args, k) -> {
-                KissError.warnFromExp(wholeExp, '$oldName has been renamed to $newName and deprecated');
-                form(wholeExp, args, k);
-            }
-            map[newName] = form;
-            k.formDocs[newName] = k.formDocs[oldName];
-        }
-
-        varOrProperty("var", k);
-        varOrProperty("prop", k);
-
-        funcOrMethod("function", k);
-        funcOrMethod("method", k);
-
-        return map;
-    }
-
-    static function fieldAccess(formName:String, fieldName:String, nameExp:ReaderExp, ?access:Array<Access>) {
-        if (access == null) {
-            access = if (["defvar", "defprop", "var", "prop"].indexOf(formName) != -1) {
-                [AFinal];
-            } else {
-                [];
-            };
-        }
-        // AMacro access is not allowed because it wouldn't make sense to write Haxe macros in Kiss
-        // when you can write Kiss macros which are just as powerful
-        return switch (nameExp.def) {
-            case MetaExp("mut", nameExp):
-                access.remove(AFinal);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("override", nameExp):
-                access.push(AOverride);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("dynamic", nameExp):
-                access.push(ADynamic);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("inline", nameExp):
-                access.push(AInline);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("final", nameExp):
-                access.push(AFinal);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("public", nameExp):
-                access.push(APublic);
-                fieldAccess(formName, fieldName, nameExp, access);
-            case MetaExp("private", nameExp):
-                access.push(APrivate);
-                fieldAccess(formName, fieldName, nameExp, access);
-            default:
-                if (["defvar", "defun", "var", "function"].indexOf(formName) != -1) {
-                    access.push(AStatic);
-                }
-                // If &public or &private is not used, a shortcut to make a private field is
-                // to start its name with _
-                if (access.indexOf(APrivate) == -1 && access.indexOf(APublic) == -1) {
-                    access.push(if (fieldName.startsWith("_")) APrivate else APublic);
-                }
-                access;
-        };
-    }
-
-    static function isVoid(nameExp:ReaderExp) {
-        return switch (nameExp.def) {
-            case MetaExp(_, nameExp):
-                isVoid(nameExp);
-            case TypedExp("Void", _) | Symbol("new"):
-                true;
-            default:
-                false;
-        }
-    }
-
-    static function varOrProperty(formName:String, k:KissState) {
-        k.doc(formName, 1, 3, '($formName <optional &mut> <optional :Type> <name> <optional value>)');
-        k.fieldForms[formName] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var name = Helpers.varName(formName, args[0]);
-            checkPrintFieldsCalledWarning(name, wholeExp, k);
-            var access = fieldAccess(formName, name, args[0]);
-
-            var type = Helpers.explicitType(args[0]);
-            k.addVarInScope(
-                {name: name, type: type}, 
-                false,
-                access.indexOf(AStatic) != -1);
-                
-            function varOrPropKind(args:Array<ReaderExp>) {
-                return if (args.length > 1) {
-                    switch (args[1].def) {
-                        case CallExp({pos:_, def:Symbol("property")}, innerArgs):
-                            args[1].checkNumArgs(2, 3, "(property <read access> <write access> <?value>)");
-                            function accessType(read, arg) {
-                                var acceptable = ["default", "null", if (read) "get" else "set", "dynamic", "never"];
-                                return switch (arg.def) {
-                                    case Symbol(access) if (acceptable.contains(access)):
-                                        access;
-                                    default: throw KissError.fromExp(arg, 'Expected a haxe property access keyword: one of [${acceptable.join(", ")}]');
-                                };
-                            }
-                            var readAccess = accessType(true, innerArgs[0]);
-                            var writeAccess = accessType(false, innerArgs[1]);
-                            var value = if (innerArgs.length > 2) k.convert(innerArgs[2]) else null;
-                            FProp(readAccess, writeAccess, type, value);
-                        default:
-                            FVar(type, k.convert(args[1]));
-                    };
-                } else {
-                    FVar(type, null);
-                };
-            }
-
-            ({
-                name: name,
-                access: access,
-                kind: varOrPropKind(args), 
-                pos: wholeExp.macroPos()
-            } : Field);
-        }
-    }
-
-    static function funcOrMethod(formName:String, k:KissState) {
-        k.doc(formName, 2, null, '($formName <optional &dynamic> <optional :Type> <name> [<argNames...>] <body...>)');
-        k.fieldForms[formName] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var name = Helpers.varName(formName, args[0]);
-            var access = fieldAccess(formName, name, args[0]);
-            var inStaticFunction = access.indexOf(AStatic) != -1;
-            var returnsValue = !isVoid(args[0]);
-
-            var wasInStatic = k.inStaticFunction;
-            var typeParams = switch (args[1].def) {
-                case TypeParams(p):
-                    args.splice(1, 1);    
-                    p;
-                default:
-                    [];
-            } 
-
-            var f:Field = {
-                name: name,
-                access: access,
-                kind: FFun(
-                    Helpers.makeFunction(
-                        args[0],
-                        returnsValue,
-                        args[1],
-                        args.slice(2),
-                        k.forStaticFunction(inStaticFunction),
-                        formName,
-                        typeParams)),
-                pos: wholeExp.macroPos()
-            };
-
-            k = k.forStaticFunction(wasInStatic);
-            return f;
-        }
-    }
-
-    static function checkPrintFieldsCalledWarning(name, exp:ReaderExp, k:KissState) {
-        if (k.printFieldsCalls.length > 0) {
-            KissError.warnFromExp(exp, 'new field "$name" defined here will not be printed by preceding print macro(s)');
-            for (printCall in k.printFieldsCalls) {
-                KissError.warnFromExp(printCall, "print macro used here");
-            }
-        }
-    }
-}
diff --git a/kiss/src/kiss/FuzzyMap.hx b/kiss/src/kiss/FuzzyMap.hx
deleted file mode 100644
index c6952ed4..00000000
--- a/kiss/src/kiss/FuzzyMap.hx
+++ /dev/null
@@ -1,57 +0,0 @@
-package kiss;
-
-import haxe.ds.StringMap;
-import kiss.FuzzyMapTools;
-
-using hx.strings.Strings;
-
-@:forward(clear, copy, iterator, keyValueIterator, keys, toString)
-abstract FuzzyMap<T>(StringMap<T>) from StringMap<T> to StringMap<T> {
-    public inline function new(?m:StringMap<T>) {
-        this = if (m != null) m else new StringMap<T>();
-    }
-
-    @:from
-    static public function fromMap<T>(m:StringMap<T>) {
-        return new FuzzyMap<T>(m);
-    }
-
-    @:to
-    public function toMap() {
-        return this;
-    }
-
-    function bestMatch(fuzzySearchKey:String, ?throwIfNone=true):String {
-        return FuzzyMapTools.bestMatch(this, fuzzySearchKey, throwIfNone);
-    }
-
-    @:arrayAccess
-    public inline function get(fuzzySearchKey:String):Null<T> {
-        var match = bestMatch(fuzzySearchKey);
-        var value = this.get(match);
-        if (match != null) {
-            FuzzyMapTools.onMatchMade(this, fuzzySearchKey, value);
-        }
-        return value;
-    }
-
-    public inline function remove(fuzzySearchKey:String):Bool {
-        var key = bestMatch(fuzzySearchKey, false);
-        if (key == null) return false;
-        return this.remove(key);
-    }
-
-    public inline function exists(fuzzySearchKey:String):Bool {
-        return bestMatch(fuzzySearchKey, false) != null;
-    }
-
-    public inline function existsExactly(searchKey:String):Bool {
-        return this.exists(searchKey);
-    }
-
-    @:arrayAccess
-    public inline function set(key:String, v:T):T {
-        this.set(key, v);
-        return v;
-    }
-}
diff --git a/kiss/src/kiss/FuzzyMapTools.hx b/kiss/src/kiss/FuzzyMapTools.hx
deleted file mode 100644
index 1c833810..00000000
--- a/kiss/src/kiss/FuzzyMapTools.hx
+++ /dev/null
@@ -1,74 +0,0 @@
-package kiss;
-
-import haxe.Json;
-import haxe.ds.StringMap;
-using hx.strings.Strings;
-
-typedef MapInfo = {
-    file:String,
-    matches:Map<String,Dynamic>
-};
-
-class FuzzyMapTools {
-    static var serializingMaps = new Map<StringMap<Dynamic>, MapInfo>();
-
-    /**
-    * FuzzyMap is highly inefficient, so you may wish to memoize the matches that it makes before
-    * releasing your project. FuzzyMapTools.serializeMatches() helps with this
-    */
-    public static function serializeMatches(m:StringMap<Dynamic>, file:String) {
-        serializingMaps[m] = { file: file, matches: new Map() };
-    }
-
-    public static function fuzzyMatchScore(key:String, fuzzySearchKey:String) {
-        return 1 - (key.toLowerCase().getLevenshteinDistance(fuzzySearchKey.toLowerCase()) / Math.max(key.length, fuzzySearchKey.length));
-    }
-
-    static var threshold = 0.4;
-
-    public static function bestMatch<T>(map:FuzzyMap<T>, fuzzySearchKey:String, ?throwIfNone=true):String {
-        if (map.existsExactly(fuzzySearchKey)) return fuzzySearchKey;
-
-        var bestScore = 0.0;
-        var bestKey = null;
-
-        for (key in map.keys()) {
-            var score = fuzzyMatchScore(key, fuzzySearchKey);
-            if (score > bestScore) {
-                bestScore = score;
-                bestKey = key;
-            }
-        }
-
-        if (bestScore < threshold) {
-            if (throwIfNone)
-                throw 'No good match for $fuzzySearchKey in $map -- best was $bestKey with $bestScore';
-            else
-                return null;
-        }
-
-        #if (test || debug)
-        trace('Fuzzy match $bestKey for $fuzzySearchKey score: $bestScore');
-        #end
-        
-        return bestKey;
-    }
-
-    @:allow(kiss.FuzzyMap)
-    static function onMatchMade(m:StringMap<Dynamic>, key:String, value:Dynamic) {
-        #if (sys || hxnodejs)
-        if (serializingMaps.exists(m)) {
-            var info = serializingMaps[m];
-            info.matches[key] = value;
-            sys.io.File.saveContent(info.file, Json.stringify(info.matches));
-        }
-        #end
-    }
-
-    public static function loadMatches(m:StringMap<Dynamic>, json:String) {
-        var savedMatches:haxe.DynamicAccess<Dynamic> = Json.parse(json);
-        for (key => value in savedMatches.keyValueIterator()) {
-            m.set(key, value);
-        }
-    }
-}
\ No newline at end of file
diff --git a/kiss/src/kiss/Helpers.hx b/kiss/src/kiss/Helpers.hx
deleted file mode 100644
index ae28481d..00000000
--- a/kiss/src/kiss/Helpers.hx
+++ /dev/null
@@ -1,846 +0,0 @@
-package kiss;
-
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.PositionTools;
-import hscript.Parser;
-import hscript.Interp;
-import kiss.Reader;
-import kiss.ReaderExp;
-import kiss.KissError;
-import kiss.Kiss;
-import kiss.SpecialForms;
-import kiss.Prelude;
-import kiss.cloner.Cloner;
-import uuid.Uuid;
-import sys.io.Process;
-
-using uuid.Uuid;
-using tink.MacroApi;
-using kiss.Reader;
-using kiss.Helpers;
-using kiss.Kiss;
-using StringTools;
-using haxe.macro.ExprTools;
-
-/**
- * Compile-time helper functions for Kiss. Don't import or reference these at runtime.
- */
-class Helpers {
-    public static function macroPos(exp:ReaderExp) {
-        var kissPos = exp.pos;
-        return PositionTools.make({
-            min: kissPos.absoluteChar,
-            max: kissPos.absoluteChar,
-            file: kissPos.file
-        });
-    }
-
-    public static function withMacroPosOf(e:ExprDef, exp:ReaderExp):Expr {
-        return {
-            pos: macroPos(exp),
-            expr: e
-        };
-    }
-
-    static function startsWithUpperCase(s:String) {
-        return s.charAt(0) == s.charAt(0).toUpperCase();
-    }
-
-    public static function parseTypePath(path:String, ?from:ReaderExp):TypePath {
-        return switch (parseComplexType(path, from)) {
-            case TPath(path):
-                path;
-            default:
-                var errorMessage = 'Haxe could not parse a type path from $path';
-                if (from == null) {
-                    throw errorMessage;
-                } else {
-                    throw KissError.fromExp(from, errorMessage);
-                }
-        };
-    }
-
-    public static function parseComplexType(path:String, ?from:ReaderExp, mustResolve=false):ComplexType {
-        // Trick Haxe into parsing it for us:
-        var typeCheckStr = 'var thing:$path;';
-        var errorMessage = 'Haxe could not parse a complex type from `$path` in `${typeCheckStr}`';
-        
-        function throwError() {
-            if (from == null) {
-                throw errorMessage;
-            } else {
-                throw KissError.fromExp(from, errorMessage);
-            };
-        }
-        try {
-            var typeCheckExpr = Context.parse(typeCheckStr, Context.currentPos());
-            var t = switch (typeCheckExpr.expr) {
-                case EVars([{
-                    type: complexType
-                }]):
-                    complexType;
-                default:
-                    throwError();
-                    return null;
-            };
-            if (mustResolve) {
-                try {
-                    var pos = if (from != null) from.macroPos() else Context.currentPos();
-                    Context.resolveType(t, pos);
-                } catch (e:Dynamic) {
-                    errorMessage = 'Type not found: $path';
-                    throwError(); 
-                }
-            }
-            return t;
-        } catch (err) {
-            throwError();
-            return null;
-        }
-    }
-
-    public static function explicitTypeString(nameExp:ReaderExp):String {
-        return switch (nameExp.def) {
-            case MetaExp(_, innerExp):
-                explicitTypeString(innerExp);
-            case TypedExp(type, _):
-                type;
-            default: null;
-        };
-    }
-
-    public static function explicitType(nameExp:ReaderExp):ComplexType {
-        var string = explicitTypeString(nameExp);
-        if (string == null) return null; 
-        return Helpers.parseComplexType(string, nameExp);
-    }
-
-    public static function varName(formName:String, nameExp:ReaderExp, nameType = "variable") {
-        return switch (nameExp.def) {
-            case Symbol(name):
-                name;
-            case MetaExp(_, nameExp) | TypedExp(_, nameExp):
-                varName(formName, nameExp);
-            default:
-                throw KissError.fromExp(nameExp, 'The first argument to $formName should be a $nameType name, :Typed $nameType name, and/or &meta $nameType name.');
-        };
-    }
-
-    public static function makeTypeParam(param:ReaderExp, ?constraints:Array<ComplexType> = null):TypeParamDecl {
-        if (constraints == null) constraints = [];
-        switch (param.def) {
-            case Symbol(name):
-                return {
-                    name: name,
-                    constraints: constraints
-                };
-            case TypedExp(type, param):
-                constraints.push(parseComplexType(type));
-                return makeTypeParam(param, constraints);
-            default:
-                throw KissError.fromExp(param, "expected <GenericTypeName> or :<Constraint> <GenericTypeName>");
-        }
-    }
-
-    public static function makeFunction(?name:ReaderExp, returnsValue:Bool, argList:ReaderExp, body:List<ReaderExp>, k:KissState, formName:String, typeParams:Array<ReaderExp>):Function {
-        var funcName = if (name != null) {
-            varName(formName, name, "function");
-        } else {
-            "";
-        };
-
-        var params = [for (p in typeParams) makeTypeParam(p)];
-
-        var numArgs = 0;
-        // Once the &opt meta appears, all following arguments are optional until &rest
-        var opt = false;
-        // Once the &rest meta appears, no other arguments can be declared
-        var rest = false;
-        var restProcessed = false;
-
-        function makeFuncArg(funcArg:ReaderExp):FunctionArg {
-            if (restProcessed) {
-                throw KissError.fromExp(funcArg, "cannot declare more arguments after a &rest argument");
-            }
-            return switch (funcArg.def) {
-                case MetaExp("rest", innerFuncArg):
-                    if (funcName == "") {
-                        throw KissError.fromExp(funcArg, "lambda does not support &rest arguments");
-                    }
-
-                    var typeOfRestArg = explicitTypeString(funcArg);
-                    var isDynamicArray = switch (typeOfRestArg) {
-                        case "Array<Dynamic>" | "kiss.List<Dynamic>" | "List<Dynamic>":
-                            true;
-                        default:
-                            false;
-                    };
-
-                    // rest arguments define a Kiss special form with the function's name that wraps
-                    // the rest args in a list when calling it from Kiss
-                    k.specialForms[funcName] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-                        var realCallArgs = args.slice(0, numArgs);
-                        var restArgs = args.slice(numArgs);
-                        var arg = if (isDynamicArray) {
-                            var b = funcArg.expBuilder();
-                            b.let([b.typed("Array<Dynamic>", b.symbol("args")), b.list([])], [
-                                for (arg in restArgs)
-                                    b.callField("push", b.symbol("args"), [arg])
-                            ].concat([b.symbol("args")]));
-                        } else {
-                            ListExp(restArgs).withPosOf(wholeExp);
-                        }
-                        realCallArgs.push(arg);
-                        ECall(k.convert(Symbol(funcName).withPosOf(wholeExp)), realCallArgs.map(k.convert)).withMacroPosOf(wholeExp);
-                    };
-
-                    opt = true;
-                    rest = true;
-                    makeFuncArg(innerFuncArg);
-                case MetaExp("opt", innerFuncArg):
-                    opt = true;
-                    makeFuncArg(innerFuncArg);
-                default:
-                    if (rest) {
-                        restProcessed = true;
-                    } else {
-                        ++numArgs;
-                    }
-                    {
-                        // These could use varName() and explicitType() but so far there are no &meta annotations for function arguments
-                        name: switch (funcArg.def) {
-                            case Symbol(name) | TypedExp(_, {pos: _, def: Symbol(name)}):
-                                name;
-                            default:
-                                throw KissError.fromExp(funcArg, 'function argument should be a symbol or typed symbol');
-                        },
-                        type: switch (funcArg.def) {
-                            case TypedExp(type, _):
-                                Helpers.parseComplexType(type, funcArg);
-                            default: null;
-                        },
-                        opt: opt
-                    };
-            };
-        }
-
-        var args:Array<FunctionArg> = switch (argList.def) {
-            case ListExp(funcArgs):
-                funcArgs.map(makeFuncArg);
-            case CallExp(_, _):
-                throw KissError.fromExp(argList, 'expected an argument list. Change the parens () to brackets []');
-            default:
-                throw KissError.fromExp(argList, 'expected an argument list');
-        };
-
-        var vars = [for (arg in args) {
-            {
-                name: arg.name,
-                type: arg.type
-            }
-        }];
-
-        for (v in vars) {
-            k.addVarInScope(v, true);
-        }
-
-        var expr = if (body.length == 0) {
-            EReturn(null).withMacroPosOf(if (name != null) name else argList);
-        } else {
-            var builder = body[0].expBuilder();
-            var block = k.convert(builder.begin(body));
-
-            if (returnsValue) {
-                EReturn(block).withMacroPosOf(body[-1]);
-            } else {
-                block;
-            };
-        }
-
-        for (v in vars) {
-            k.removeVarInScope(v, true);
-        }
-
-        // To make function args immutable by default, we would use (let...) instead of (begin...)
-        // to make the body expression.
-        // But setting null arguments to default values is so common, and arguments are not settable references,
-        // so function args are not immutable.
-        return {
-            ret: if (name != null) Helpers.explicitType(name) else null,
-            args: args,
-            expr: expr,
-            params: params
-        };
-    }
-
-    // The name of this function is confusing--it actually makes a Haxe `case` expression, not a switch-case expression
-    public static function makeSwitchCase(caseExp:ReaderExp, k:KissState):Case {
-        var guard:Expr = null;
-        var restExpIndex = -1;
-        var restExpName = "";
-        var expNames = [];
-        var listVarSymbol = null;
-
-        var varsInScope:Array<Var> = [];
-        function makeSwitchPattern(patternExp:ReaderExp):Array<Expr> {
-            return switch (patternExp.def) {
-                case _ if (k.hscript):
-                    var patternExpr = k.forCaseParsing().convert(patternExp);
-                    [switch (patternExpr.expr) {
-                        case EConst(CString(_, _)):
-                            patternExpr;
-                        case EConst(CInt(_) | CFloat(_)):
-                            patternExpr;
-                        case EConst(CIdent("null")):
-                            patternExpr;
-                        default:
-                            throw KissError.fromExp(caseExp, "case expressions in macros can only match literal values");
-                    }];
-                case CallExp({pos: _, def: Symbol("when")}, whenExps):
-                    patternExp.checkNumArgs(2, 2, "(when <guard> <pattern>)");
-                    if (guard != null)
-                        throw KissError.fromExp(caseExp, "case pattern can only have one `when` or `unless` guard");
-                    guard = macro Prelude.truthy(${k.convert(whenExps[0])});
-                    makeSwitchPattern(whenExps[1]);
-                case CallExp({pos: _, def: Symbol("unless")}, whenExps):
-                    patternExp.checkNumArgs(2, 2, "(unless <guard> <pattern>)");
-                    if (guard != null)
-                        throw KissError.fromExp(caseExp, "case pattern can only have one `when` or `unless` guard");
-                    guard = macro !Prelude.truthy(${k.convert(whenExps[0])});
-                    makeSwitchPattern(whenExps[1]);
-                case ListEatingExp(exps) if (exps.length == 0):
-                    throw KissError.fromExp(patternExp, "list-eating pattern should not be empty");
-                case ListEatingExp(exps):
-                    for (idx in 0...exps.length) {
-                        var exp = exps[idx];
-                        switch (exp.def) {
-                            case Symbol(_) | MetaExp("mut", {pos: _, def: Symbol(_)}):
-                                expNames.push(exp);
-                            case ListRestExp(name):
-                                if (restExpIndex > -1) {
-                                    throw KissError.fromExp(patternExp, "list-eating pattern cannot have multiple ... or ...<restVar> expressions");
-                                }
-                                restExpIndex = idx;
-                                restExpName = name;
-                            default:
-                                throw KissError.fromExp(exp, "list-eating pattern can only contain symbols, ..., or ...<restVar>");
-                        }
-                    }
-
-                    if (restExpIndex == -1) {
-                        throw KissError.fromExp(patternExp, "list-eating pattern is missing ... or ...<restVar>");
-                    }
-
-                    if (expNames.length == 0) {
-                        throw KissError.fromExp(patternExp, "list-eating pattern must match at least one single element");
-                    }
-
-                    var b = patternExp.expBuilder();
-                    listVarSymbol = b.symbol();
-                    guard = k.convert(b.callSymbol(">", [b.field("length", listVarSymbol), b.raw(Std.string(expNames.length))]));
-                    makeSwitchPattern(listVarSymbol);
-                default:
-                    var patternExpr = k.forCaseParsing().convert(patternExp);
-                    // Recurse into the pattern expr for identifiers that must be added
-                    // to vars in scope:
-                    function findIdents(subExpr) {
-                        switch (subExpr.expr) {
-                            case EConst(CIdent(name)):
-                                varsInScope.push({name: name});
-                            default:
-                                haxe.macro.ExprTools.iter(subExpr, findIdents);
-                        }
-                    }
-
-                    findIdents(patternExpr);
-
-                    [patternExpr];
-            }
-        }
-
-        return switch (caseExp.def) {
-            case CallExp(patternExp, caseBodyExps):
-                var pattern = makeSwitchPattern(patternExp);
-                var b = caseExp.expBuilder();
-                var body = if (restExpIndex == -1) {
-                    for (v in varsInScope) {
-                        k.addVarInScope(v, true, false);
-                    }
-                    var e = k.convert(b.begin(caseBodyExps));
-                    for (v in varsInScope) {
-                        k.removeVarInScope(v, true);
-                    }
-                    e;
-                } else {
-                    var letBindings = [];
-                    for (idx in 0...restExpIndex) {
-                        letBindings.push(expNames.shift());
-                        letBindings.push(b.callSymbol("nth", [listVarSymbol, b.raw(Std.string(idx))]));
-                    }
-                    if (restExpName == "") {
-                        restExpName = "_";
-                    }
-                    letBindings.push(b.symbol(restExpName));
-                    var sliceArgs = [b.raw(Std.string(restExpIndex))];
-                    if (expNames.length > 0) {
-                        sliceArgs.push(b.callSymbol("-", [b.field("length", listVarSymbol), b.raw(Std.string(expNames.length))]));
-                    }
-                    letBindings.push(b.call(b.field("slice", listVarSymbol), sliceArgs));
-                    while (expNames.length > 0) {
-                        var idx = b.callSymbol("-", [b.field("length", listVarSymbol), b.raw(Std.string(expNames.length))]);
-                        letBindings.push(expNames.shift());
-                        letBindings.push(b.callSymbol("nth", [listVarSymbol, idx]));
-                    }
-                    var letExp = b.callSymbol("let", [b.list(letBindings)].concat(caseBodyExps));
-                    k.convert(letExp);
-                };
-                // These prints for debugging need to be wrapped in comments because they'll get picked up by convertToHScript()
-                // Prelude.print('/* $pattern */');
-                // Prelude.print('/* $body */');
-                // Prelude.print('/* $guard */');
-                {
-                    values: pattern,
-                    expr: body,
-                    guard: guard
-                };
-            default:
-                throw KissError.fromExp(caseExp, "case expressions for (case...) must take the form ([pattern] [body...])");
-        }
-    }
-
-    /**
-        Throw a KissError if the given expression has the wrong number of arguments
-    **/
-    public static function checkNumArgs(wholeExp:ReaderExp, min:Null<Int>, max:Null<Int>, ?expectedForm:String) {
-        if (expectedForm == null) {
-            expectedForm = if (max == min) {
-                '$min arguments';
-            } else if (max == null) {
-                'at least $min arguments';
-            } else if (min == null) {
-                'no more than $max arguments';
-            } else if (min == null && max == null) {
-                throw 'checkNumArgs() needs a min or a max';
-            } else {
-                'between $min and $max arguments';
-            };
-        }
-
-        var args = switch (wholeExp.def) {
-            case CallExp(_, args): args;
-            default: throw KissError.fromExp(wholeExp, "Can only check number of args in a CallExp");
-        };
-
-        if (min != null && args.length < min) {
-            throw KissError.fromExp(wholeExp, 'Not enough arguments. Expected $expectedForm');
-        } else if (max != null && args.length > max) {
-            throw KissError.fromExp(wholeExp, 'Too many arguments. Expected $expectedForm');
-        }
-    }
-
-    public static function removeTypeAnnotations(exp:ReaderExp):ReaderExp {
-        var def = switch (exp.def) {
-            case Symbol(_) | StrExp(_) | RawHaxe(_) | RawHaxeBlock(_) | Quasiquote(_):
-                exp.def;
-            case CallExp(func, callArgs):
-                CallExp(removeTypeAnnotations(func), callArgs.map(removeTypeAnnotations));
-            case ListExp(elements):
-                ListExp(elements.map(removeTypeAnnotations));
-            case TypedExp(type, innerExp):
-                innerExp.def;
-            case MetaExp(meta, innerExp):
-                MetaExp(meta, removeTypeAnnotations(innerExp));
-            case FieldExp(field, innerExp, safe):
-                FieldExp(field, removeTypeAnnotations(innerExp), safe);
-            case KeyValueExp(keyExp, valueExp):
-                KeyValueExp(removeTypeAnnotations(keyExp), removeTypeAnnotations(valueExp));
-            case Unquote(innerExp):
-                Unquote(removeTypeAnnotations(innerExp));
-            case UnquoteList(innerExp):
-                UnquoteList(removeTypeAnnotations(innerExp));
-            case None:
-                None;
-            default:
-                throw KissError.fromExp(exp, 'cannot remove type annotations');
-        };
-        return def.withPosOf(exp);
-    }
-    // hscript.Interp is very finicky about some edge cases.
-    // This function handles them
-    private static function mapForInterp(expr:Expr):Expr {
-        return expr.map(subExp -> {
-            switch (subExp.expr) {
-                case ETry(e, catches):
-                    catches = [for (c in catches) {
-                        // hscript.Parser expects :Dynamic after the catch varname
-                        {
-                            type: Helpers.parseComplexType("Dynamic"),
-                            name: c.name,
-                            expr: c.expr
-                        };
-                    }];
-                    {
-                        pos: subExp.pos,
-                        expr: ETry(e, catches)
-                    };
-                default: mapForInterp(subExp);
-            }
-        });
-    }
-
-    static var parser = new Parser(); 
-    static function compileTimeHScript(exp:ReaderExp, k:KissState) {
-        var hscriptExp = mapForInterp(k.forMacroEval().convert(exp));
-        var code = hscriptExp.toString(); // tink_macro to the rescue
-        #if macrotest
-        Prelude.print("Compile-time hscript: " + code);
-        #end
-        // Need parser external to the KissInterp to wrap parsing in an informative try-catch
-        var parsed = try {
-            parser.parseString(code);
-        } catch (e) {
-            throw KissError.fromExp(exp, 'macro-time hscript parsing failed with $e:\n$code');
-        };
-        return parsed;
-    }
-
-    public static function runAtCompileTimeDynamic(exp:ReaderExp, k:KissState, ?args:Map<String, Dynamic>):Dynamic {
-        var parsed = compileTimeHScript(exp, k);
-        
-        // The macro interpreter gets everything a KissInterp has,
-        // plus macro-specific things.
-        var interp = new KissInterp();
-        interp.variables.set("read", Reader.assertRead.bind(_, k));
-        interp.variables.set("readExpArray", Reader.readExpArray.bind(_, _, k));
-        interp.variables.set("ReaderExp", ReaderExpDef);
-        interp.variables.set("nextToken", Reader.nextToken.bind(_, "a token"));
-        interp.variables.set("printExp", printExp);
-        interp.variables.set("kiss", {
-            ReaderExp: {
-                ReaderExpDef: ReaderExpDef
-            },
-            KissInterp: KissInterp,
-            Prelude: Prelude
-        });
-        interp.variables.set("k", k.forMacroEval());
-        interp.variables.set("Macros", Macros);
-        interp.variables.set("Stream", Stream);
-        for (name => value in k.macroVars) {
-            interp.variables.set(name, value);
-        }
-        interp.variables.set("_setMacroVar", (name, value) -> {
-            k.macroVars[name] = value;
-            interp.variables.set(name, value);
-        });
-        interp.variables.set("KissError", KissError);
-
-        function innerRunAtCompileTimeDynamic(innerExp:ReaderExp) {
-            // in case macroVars have changed
-            for (name => value in k.macroVars) {
-                interp.variables.set(name, value);
-            }
-            var locals = interp.getLocals();
-            interp.setLocals(new Cloner().clone(locals));
-            var value = interp.publicExprReturn(compileTimeHScript(innerExp, k));
-            interp.setLocals(locals);
-            if (value == null) {
-                throw KissError.fromExp(exp, "compile-time evaluation returned null");
-            }
-            return value;
-        }
-        function innerRunAtCompileTime(exp:ReaderExp) {
-            var v:Dynamic = innerRunAtCompileTimeDynamic(exp);
-            return compileTimeValueToReaderExp(v, exp);
-        }
-
-        interp.variables.set("eval", innerRunAtCompileTimeDynamic);
-        interp.variables.set("Helpers", {
-            evalUnquotes: evalUnquotes.bind(_, innerRunAtCompileTime),
-            runAtCompileTime: innerRunAtCompileTime,
-            // TODO it is bad that Helpers functions have to manually be included here:
-            explicitTypeString: Helpers.explicitTypeString,
-            argList: Helpers.argList,
-            bindingList: Helpers.bindingList
-        });
-        interp.variables.set("__interp__", interp);
-
-        if (args != null) {
-            for (arg => value in args) {
-                interp.variables.set(arg, value);
-            }
-        }
-        var value:Dynamic = interp.execute(parsed);
-        if (value == null) {
-            throw KissError.fromExp(exp, "compile-time evaluation returned null");
-        }
-        return value;
-    }
-
-    public static function runAtCompileTime(exp:ReaderExp, k:KissState, ?args:Map<String, Dynamic>):ReaderExp {
-        var value = runAtCompileTimeDynamic(exp, k, args);
-        var expResult = compileTimeValueToReaderExp(value, exp);
-        #if macrotest
-        Prelude.print('Compile-time value: ${Reader.toString(expResult.def)}');
-        #end
-        return expResult;
-    }
-
-    // The value could be either a ReaderExp, ReaderExpDef, Array of ReaderExp/ReaderExpDefs, or something else entirely,
-    // but it needs to be a ReaderExp for evalUnquotes()
-    static function compileTimeValueToReaderExp(e:Dynamic, source:ReaderExp):ReaderExp {
-        return if (Std.isOfType(e, Array)) {
-            var arr:Array<Dynamic> = e;
-            var listExps = arr.map(compileTimeValueToReaderExp.bind(_, source));
-            ListExp(listExps).withPosOf(source);
-        } else if (Std.isOfType(e, Float) || Std.isOfType(e, Int)) {
-            Symbol(Std.string(e)).withPosOf(source);
-        } else if (Std.isOfType(e, Bool)) {
-            Symbol(Std.string(e)).withPosOf(source);
-        } else if (Std.isOfType(e, String)) {
-            var s:String = e;
-            StrExp(s).withPosOf(source);
-        } else if (Std.isOfType(e, ReaderExpDef)) {
-            (e : ReaderExpDef).withPosOf(source);
-        } else if (e.pos != null && e.def != null) {
-            (e : ReaderExp);
-        } else {
-            throw KissError.fromExp(source, 'Value $e cannot be used as a Kiss expression');
-        }
-    }
-
-    public static function printExp(e:Dynamic, label = "") {
-        var toPrint = label;
-        if (label.length > 0) {
-            toPrint += ": ";
-        }
-        var expDef = if (e.def != null) e.def else e;
-        toPrint += Reader.toString(expDef);
-        Prelude.printStr(toPrint);
-        return e;
-    }
-
-    static function evalUnquoteLists(l:Array<ReaderExp>, innerRunAtCompileTime:(ReaderExp)->Dynamic):Array<ReaderExp> {
-        var idx = 0;
-        while (idx < l.length) {
-            switch (l[idx].def) {
-                case UnquoteList(exp):
-                    l.splice(idx, 1);
-                    var listToInsert:Dynamic = innerRunAtCompileTime(exp);
-                    // listToInsert could be either an array (from &rest) or a ListExp (from [list syntax])
-                    var newElements:Array<ReaderExp> = if (Std.isOfType(listToInsert, Array)) {
-                        listToInsert;
-                    } else {
-                        switch (listToInsert.def) {
-                            case ListExp(elements):
-                                elements;
-                            default:
-                                throw KissError.fromExp(listToInsert, ",@ can only be used with lists");
-                        };
-                    };
-                    for (el in newElements) {
-                        l.insert(idx++, el);
-                    }
-                default:
-                    idx++;
-            }
-        }
-        return l;
-    }
-
-    public static function evalUnquotes(exp:ReaderExp, innerRunAtCompileTime:(ReaderExp)->Dynamic):ReaderExp {
-        var recurse = evalUnquotes.bind(_, innerRunAtCompileTime);
-        var def = switch (exp.def) {
-            case Symbol(_) | StrExp(_) | RawHaxe(_) | RawHaxeBlock(_):
-                exp.def;
-            case CallExp(func, callArgs):
-                CallExp(recurse(func), evalUnquoteLists(callArgs, innerRunAtCompileTime).map(recurse));
-            case ListExp(elements):
-                ListExp(evalUnquoteLists(elements, innerRunAtCompileTime).map(recurse));
-            case TypedExp(type, innerExp):
-                TypedExp(type, recurse(innerExp));
-            case FieldExp(field, innerExp, safe):
-                FieldExp(field, recurse(innerExp), safe);
-            case KeyValueExp(keyExp, valueExp):
-                KeyValueExp(recurse(keyExp), recurse(valueExp));
-            case Unquote(innerExp):
-                var unquoteValue:Dynamic = innerRunAtCompileTime(innerExp);
-                compileTimeValueToReaderExp(unquoteValue, exp).def;
-            case MetaExp(meta, innerExp):
-                MetaExp(meta, recurse(innerExp));
-            default:
-                throw KissError.fromExp(exp, 'unquote evaluation not implemented');
-        };
-        return def.withPosOf(exp);
-    }
-
-    // Return convenient functions for succinctly making new ReaderExps that link back to an original exp's
-    // position in source code
-    public static function expBuilder(posRef:ReaderExp) {
-        function _symbol(?name:String) {
-            return Prelude.symbol(name).withPosOf(posRef);
-        }
-        function call(func:ReaderExp, args:Array<ReaderExp>) {
-            return CallExp(func, args).withPosOf(posRef);
-        }
-        function callSymbol(symbol:String, args:Array<ReaderExp>) {
-            return call(_symbol(symbol), args);
-        }
-        function field(f:String, exp:ReaderExp, ?safe:Bool) {
-            return FieldExp(f, exp, safe != null && safe).withPosOf(posRef);
-        }
-        function list(exps:Array<ReaderExp>) {
-            return ListExp(exps).withPosOf(posRef);
-        }
-        function objectWith (bindings:Array<ReaderExp>, captures:Array<ReaderExp>) {
-            return callSymbol("objectWith", [list(bindings)].concat(captures));
-        }
-        function str(s:String) {
-            return StrExp(s).withPosOf(posRef);
-        }
-        function raw(code:String) {
-            return RawHaxe(code).withPosOf(posRef);
-        }
-        function int(v:Int) {
-            return _symbol(Std.string(v));
-        }
-        function float(v:Float) {
-            return _symbol(Std.string(v));
-        }
-        function let(bindings:Array<ReaderExp>, body:Array<ReaderExp>) {
-            return callSymbol("let", [list(bindings)].concat(body));
-        }
-        function throwAssertOrNeverError(messageExp:ReaderExp) {
-            var failureError = KissError.fromExp(posRef, "").toString(AssertionFail);
-            var colonsInPrefix = if (Sys.systemName() == "Windows") 5 else 4;
-            return callSymbol("throw", [
-                callSymbol("kiss.Prelude.runtimeInsertAssertionMessage", [messageExp, str(failureError), int(colonsInPrefix)])
-            ]);
-        }
-        return {
-            call: call,
-            callSymbol: callSymbol,
-            callField: (fieldName:String, callOn:ReaderExp, args:Array<ReaderExp>) -> call(field(fieldName, callOn), args),
-            print: (arg:ReaderExp) -> CallExp(Symbol("print").withPosOf(posRef), [arg]).withPosOf(posRef),
-            the: (type:ReaderExp, value:ReaderExp) -> callSymbol("the", [type, value]),
-            not: (exp:ReaderExp) -> callSymbol("not", [exp]),
-            list: list,
-            str: str,
-            symbol: _symbol,
-            int: int,
-            float: float,
-            raw: raw,
-            typed: (path:String, exp:ReaderExp) -> TypedExp(path, exp).withPosOf(posRef),
-            meta: (m:String, exp:ReaderExp) -> MetaExp(m, exp).withPosOf(posRef),
-            field: field,
-            keyValue: (key:ReaderExp, value:ReaderExp) -> KeyValueExp(key, value).withPosOf(posRef),
-            begin: (exps:Array<ReaderExp>) -> callSymbol("begin", exps),
-            set: (v:ReaderExp, value:ReaderExp) -> callSymbol("set", [v, value]),
-            let: let,
-            objectWith: objectWith,
-            // Only use within assertion macros
-            throwAssertionError: () -> {
-                var usage = "throwAssertionError can only be used in a builder of an assertion macro";
-                var exps = switch (posRef.def) {
-                    case CallExp(_, exps):
-                        exps;
-                    default:
-                        throw KissError.fromExp(_symbol("throwAssertionError"), usage);
-                }
-                var messageExp = if (exps.length > 1) {
-                    exps[1];
-                } else {
-                    str("");
-                };
-                throwAssertOrNeverError(messageExp);
-            },
-            neverCase: () -> {
-                switch (posRef.def) {
-                    case CallExp({pos: _, def: Symbol("never")}, neverExps):
-                        posRef.checkNumArgs(1, 1, '(never <pattern>)');
-                        call(neverExps[0], [
-                            throwAssertOrNeverError(str('case should never match pattern ${Reader.toString(neverExps[0].def)}'))
-                        ]);
-                    default:
-                        posRef;
-                }
-            },
-            // Compile-time only!
-            throwKissError: (reason:String) -> {
-                callSymbol("throw", [
-                    callSymbol("KissError.fromExpStr", [
-                        // pos
-                        objectWith([
-                            _symbol("file"), str(posRef.pos.file),
-                            _symbol("line"), int(posRef.pos.line),
-                            _symbol("column"), int(posRef.pos.column),
-                            _symbol("absoluteChar"), int(posRef.pos.absoluteChar),
-                        ], []),
-                        // expStr
-                        str(Reader.toString(posRef.def)),
-                        str(reason)
-                    ])
-                ]);
-            },
-            haxeExpr: (e:haxe.macro.Expr) -> withMacroPosOf(e.expr, posRef),
-            none: () -> None.withPosOf(posRef)
-        };
-    }
-
-    public static function checkNoEarlyOtherwise(cases:kiss.List<ReaderExp>) {
-        for (i in 0...cases.length) {
-            switch (cases[i].def) {
-                case CallExp({pos: _, def: Symbol("otherwise")}, _) if (i != cases.length - 1):
-                    throw KissError.fromExp(cases[i], "(otherwise <body...>) branch must come last in a (case <...>) expression");
-                default:
-            }
-        }
-    }
-
-    public static function argList(exp:ReaderExp, forThis:String, allowEmpty = true):Array<ReaderExp> {
-        return switch (exp.def) {
-            // At macro-time, a list of exps could be passed instead of a ListExp. Handle
-            // that tricky case:
-            case null if (Std.isOfType(exp, Array)):
-                var expList = cast(exp, Array<Dynamic>);
-                var expDynamic:Dynamic = exp;
-                argList({pos:expList[0].pos, def: ListExp(expDynamic)}, forThis, allowEmpty); 
-            case ListExp([]) if (allowEmpty):
-                [];
-            case ListExp([]) if (!allowEmpty):
-                throw KissError.fromExp(exp, 'arg list for $forThis must not be empty');
-            case ListExp(argExps):
-                argExps;
-            default:
-                throw KissError.fromExp(exp, '$forThis arg list should be a list or list expression');
-        };
-    }
-
-    public static function bindingList(exp:ReaderExp, forThis:String, allowEmpty = false):Array<ReaderExp> {
-        return switch (exp.def) {
-            // At macro-time, a list of exps could be passed instead of a ListExp. Handle
-            // that tricky case:
-            case null if (Std.isOfType(exp, Array)):
-                var expList = cast(exp, Array<Dynamic>);
-                var expDynamic:Dynamic = exp;
-                bindingList({pos:expList[0].pos, def: ListExp(expDynamic)}, forThis, allowEmpty); 
-            case ListExp(bindingExps) if ((allowEmpty || bindingExps.length > 0) && bindingExps.length % 2 == 0):
-                bindingExps;
-            default:
-                throw KissError.fromExp(exp, '$forThis bindings should be a list or list expression with an even number of sub expressions (at least 2)');
-        };
-    }
-
-    public static function compileTimeResolveToString(description:String, description2:String, exp:ReaderExp, k:KissState):String {
-        switch (exp.def) {
-            case StrExp(str):
-                return str;
-            case CallExp({pos: _, def: Symbol(mac)}, innerArgs) if (k.macros.exists(mac)):
-                var docs = k.formDocs[mac];
-                exp.checkNumArgs(docs.minArgs, docs.maxArgs, docs.expectedForm);
-                return compileTimeResolveToString(description, description2, k.macros[mac](exp, innerArgs, k), k);
-            default:
-                throw KissError.fromExp(exp, '${description} should resolve at compile-time to a string literal of ${description2}');
-        }
-    }
-}
diff --git a/kiss/src/kiss/Kiss.hx b/kiss/src/kiss/Kiss.hx
deleted file mode 100644
index a250470d..00000000
--- a/kiss/src/kiss/Kiss.hx
+++ /dev/null
@@ -1,850 +0,0 @@
-package kiss;
-
-#if macro
-import haxe.Exception;
-import haxe.macro.Context;
-import haxe.macro.Expr;
-import haxe.macro.ExprTools;
-import haxe.macro.PositionTools;
-import haxe.io.Path;
-import sys.io.File;
-import kiss.Stream;
-import kiss.Reader;
-import kiss.ReaderExp;
-import kiss.FieldForms;
-import kiss.SpecialForms;
-import kiss.Macros;
-import kiss.KissError;
-import kiss.cloner.Cloner;
-import tink.syntaxhub.*;
-import haxe.ds.Either;
-
-using kiss.Kiss;
-using kiss.Helpers;
-using kiss.Reader;
-using tink.MacroApi;
-using haxe.io.Path;
-
-typedef ExprConversion = (ReaderExp) -> Expr;
-
-typedef FormDoc = {
-    minArgs:Null<Int>,
-    maxArgs:Null<Int>,
-    ?expectedForm:String,
-    ?doc:String
-};
-
-typedef KissState = {
-    className:String,
-    pack:Array<String>,
-    file:String,
-    readTable:ReadTable,
-    startOfLineReadTable:ReadTable,
-    startOfFileReadTable:ReadTable,
-    endOfFileReadTable:ReadTable,
-    fieldForms:Map<String, FieldFormFunction>,
-    specialForms:Map<String, SpecialFormFunction>,
-    macros:Map<String, MacroFunction>,
-    formDocs:Map<String, FormDoc>,
-    doc:(String, Null<Int>, Null<Int>, ?String, ?String)->Void,
-    wrapListExps:Bool,
-    loadedFiles:Map<String, Null<ReaderExp>>,
-    callAliases:Map<String, ReaderExpDef>,
-    identAliases:Map<String, ReaderExpDef>,
-    fieldList:Array<Field>,
-    // TODO This map was originally created to track whether the programmer wrote their own main function, but could also
-    // be used to allow macros to edit fields that were already defined (for instance, to decorate a function or add something
-    // to the constructor body)
-    fieldDict:Map<String, Field>,
-    loadingDirectory:String,
-    hscript:Bool,
-    macroVars:Map<String, Dynamic>,
-    collectedBlocks:Map<String, Array<ReaderExp>>,
-    inStaticFunction:Bool,
-    typeHints:Array<Var>,
-    varsInScope:Array<Var>,
-    varsInScopeAreStatic:Array<Bool>,
-    localVarsInScope:Array<Var>,
-    conversionStack:Array<ReaderExp>,
-    stateChanged:Bool,
-    printFieldsCalls:Array<ReaderExp>,
-    localVarCalls:Array<ReaderExp>
-};
-#end
-
-class Kiss {
-    #if macro
-    public static function defaultKissState(?context:FrontendContext):KissState {
-        var className = "";
-        var pack = [];
-        if (context == null) {
-            var clazz = Context.getLocalClass().get();
-            className = clazz.name;
-            pack = clazz.pack;
-        } else {
-            className = context.name;
-            pack = context.pack;
-        }
-        var k = {
-            className: className,
-            pack: pack,
-            file: "",
-            readTable: Reader.builtins(),
-            startOfLineReadTable: new ReadTable(),
-            startOfFileReadTable: new ReadTable(),
-            endOfFileReadTable: new ReadTable(),
-            fieldForms: new Map(),
-            specialForms: null,
-            macros: null,
-            formDocs: new Map(),
-            doc: null,
-            wrapListExps: true,
-            loadedFiles: new Map<String, ReaderExp>(),
-            // Helpful built-in aliases
-            // These ones might conflict with a programmer's variable names, so they only apply in call expressions:
-            callAliases: [
-                // TODO some of these probably won't conflict, and could be passed as functions for a number of reasons
-                "print" => Symbol("Prelude.print"),
-                "sort" => Symbol("Prelude.sort"),
-                "sortBy" => Symbol("Prelude.sortBy"),
-                "groups" => Symbol("Prelude.groups"),
-                "pairs" => Symbol("Prelude.pairs"),
-                "reverse" => Symbol("Prelude.reverse"),
-                "memoize" => Symbol("Prelude.memoize"),
-                "fsMemoize" => Symbol("Prelude.fsMemoize"),
-                "symbolName" => Symbol("Prelude.symbolName"),
-                "symbolNameValue" => Symbol("Prelude.symbolNameValue"),
-                "symbol" => Symbol("Prelude.symbol"),
-                "expList" => Symbol("Prelude.expList"),
-                "map" => Symbol("Lambda.map"),
-                "filter" => Symbol("Prelude.filter"),
-                "flatten" => Symbol("Lambda.flatten"),
-                "has" => Symbol("Lambda.has"),
-                "count" => Symbol("Lambda.count"),
-                "enumerate" => Symbol("Prelude.enumerate"),
-                "assertProcess" => Symbol("Prelude.assertProcess"),
-                "tryProcess" => Symbol("Prelude.tryProcess"),
-                "libPath" => Symbol("Prelude.libPath"),
-                "userHome" => Symbol("Prelude.userHome"),
-                "random" => Symbol("Std.random"),
-                "walkDirectory" => Symbol("Prelude.walkDirectory"),
-                "purgeDirectory" => Symbol("Prelude.purgeDirectory"),
-                "getTarget" => Symbol("Prelude.getTarget"),
-                // These work with (apply) because they are added as "opAliases" in Macros.kiss:
-                "min" => Symbol("Prelude.min"),
-                "max" => Symbol("Prelude.max"),
-                "iHalf" => Symbol("Prelude.iHalf"),
-                "iThird" => Symbol("Prelude.iThird"),
-                "iFourth" => Symbol("Prelude.iFourth"),
-                "iFifth" => Symbol("Prelude.iFifth"),
-                "iSixth" => Symbol("Prelude.iSixth"),
-                "iSeventh" => Symbol("Prelude.iSeventh"),
-                "iEighth" => Symbol("Prelude.iEighth"),
-                "iNinth" => Symbol("Prelude.iNinth"),
-                "iTenth" => Symbol("Prelude.iTenth"),
-                "fHalf" => Symbol("Prelude.fHalf"),
-                "fThird" => Symbol("Prelude.fThird"),
-                "fFourth" => Symbol("Prelude.fFourth"),
-                "fFifth" => Symbol("Prelude.fFifth"),
-                "fSixth" => Symbol("Prelude.fSixth"),
-                "fSeventh" => Symbol("Prelude.fSeventh"),
-                "fEighth" => Symbol("Prelude.fEighth"),
-                "fNinth" => Symbol("Prelude.fNinth"),
-                "fTenth" => Symbol("Prelude.fTenth"),
-                "uuid" => Symbol("Prelude.uuid"),
-            ],
-            identAliases: [
-                // These ones won't conflict with variables and might commonly be used with (apply)
-                "+" => Symbol("Prelude.add"),
-                "-" => Symbol("Prelude.subtract"),
-                "*" => Symbol("Prelude.multiply"),
-                "/" => Symbol("Prelude.divide"),
-                "%" => Symbol("Prelude.mod"),
-                "^" => Symbol("Prelude.pow"),
-                ">" => Symbol("Prelude.greaterThan"),
-                ">=" => Symbol("Prelude.greaterEqual"),
-                "<" => Symbol("Prelude.lessThan"),
-                "<=" => Symbol("Prelude.lesserEqual"),
-                "=" => Symbol("Prelude.areEqual"),
-                // These ones *probably* won't conflict with variables and might be passed as functions
-                "chooseRandom" => Symbol("Prelude.chooseRandom"),
-                // These ones *probably* won't conflict with variables and might commonly be used with (apply) because they are variadic
-                "joinPath" => Symbol("Prelude.joinPath"),
-                "readDirectory" => Symbol("Prelude.readDirectory"),
-                "substr" => Symbol("Prelude.substr"),
-                "isListExp" => Symbol("Prelude.isListExp"),
-                "isNull" => Symbol("Prelude.isNull")
-                /* zip functions used to live here as aliases but now they are macros that also
-                apply (the Array<Array<Dynamic>>) to the result */
-                /* intersect used to live here as an alias but now it is in a macro that also
-                applies (the Array<Array<Dynamic>>) to the result */
-                /* concat used to live here as an alias but now it is in a macro that also
-                applies (the Array<Dynamic>) to the result */
-            ],
-            fieldList: [],
-            fieldDict: new Map(),
-            loadingDirectory: "",
-            hscript: false,
-            macroVars: new Map(),
-            collectedBlocks: new Map(),
-            inStaticFunction: false,
-            typeHints: [],
-            varsInScope: [],
-            varsInScopeAreStatic: [],
-            localVarsInScope: [],
-            conversionStack: [],
-            stateChanged: false,
-            printFieldsCalls: [],
-            localVarCalls: []
-        };
-
-        k.doc = (form:String, minArgs:Null<Int>, maxArgs:Null<Int>, expectedForm = "", doc = "") -> {
-            k.formDocs[form] = {
-                minArgs: minArgs,
-                maxArgs: maxArgs,
-                expectedForm: expectedForm,
-                doc: doc
-            };
-            return;
-        };
-
-        FieldForms.addBuiltins(k);
-        k.specialForms = SpecialForms.builtins(k, context);
-        k.macros = Macros.builtins(k);
-
-        return k;
-    }
-
-    public static function _try<T>(operation:() -> T):Null<T> {
-        #if !macrotest
-        try {
-        #end
-            return operation();
-        #if !macrotest
-        } catch (err:StreamError) {
-            Sys.stderr().writeString(err + "\n");
-            Sys.exit(1);
-            return null;
-        } catch (err:KissError) {
-            Sys.stderr().writeString(err + "\n");
-            Sys.exit(1);
-            return null;
-        } catch (err:UnmatchedBracketSignal) {
-            Sys.stderr().writeString(Stream.toPrint(err.position) + ': Unmatched ${err.type}\n');
-            Sys.exit(1);
-            return null;
-        } catch (err:Exception) {
-            Sys.stderr().writeString("Error: " + err.message + "\n");
-            Sys.stderr().writeString(err.stack.toString() + "\n");
-            Sys.exit(1);
-            return null;
-        }
-        #end
-    }
-
-    #end
-    public static macro function exp(kissCode:ExprOf<String>) {
-        var pos = kissCode.pos;
-        var pos = PositionTools.getInfos(pos);
-        var kissCode = ExprTools.getValue(kissCode);
-
-        var content = File.getContent(pos.file).substr(0, pos.min);
-        var lines:kiss.List<String> = content.split('\n');
-        var lineNumber = lines.length;
-        var column = lines[-1].length + 1;
-        var pos = {
-            file: pos.file,
-            absoluteChar: pos.min,
-            line: lineNumber,
-            column: column
-        };
-        
-        return _try(() -> {
-            var exp = null;
-            var stream = Stream.fromString(kissCode, pos);
-            var k = defaultKissState();
-            Reader.readAndProcess(stream, k, (nextExp) -> {
-                if (exp == null) {
-                    exp = readerExpToHaxeExpr(nextExp, k);
-                } else {
-                    throw KissError.fromExp(nextExp, "can't have multiple top-level expressions in Kiss.exp() input");
-                }
-            });
-            return exp;
-        });
-    }
-    #if macro
-    static function addContextFields(k:KissState, useClassFields:Bool) {
-        if (useClassFields) {
-            k.fieldList = Context.getBuildFields();
-            for (field in k.fieldList) {
-                k.fieldDict[field.name] = field;
-                switch (field.kind) {
-                    case FVar(t, e) | FProp(_, _, t, e):
-                        var v = {
-                            name: field.name,
-                            type: t,
-                            expr: e
-                        };
-                        k.addVarInScope(v, false, field.access.indexOf(AStatic) != -1);
-                    default:
-                }
-                
-            }
-        }
-    }
-
-    /**
-        Build macro: add fields to a class from a corresponding .kiss file
-    **/
-    public static function build(?kissFile:String, ?k:KissState, useClassFields = true, ?context:FrontendContext):Array<Field> {
-
-        var classPath = Context.getPosInfos(Context.currentPos()).file;
-        // (load... ) relative to the original file
-        var loadingDirectory = if (classPath == '?') {
-            var p = Path.directory(kissFile);
-            kissFile = kissFile.withoutDirectory();
-            p;
-        } else {
-            Path.directory(classPath);
-        }
-        if (kissFile == null) {
-            kissFile = classPath.withoutDirectory().withoutExtension().withExtension("kiss");
-        }
-        //trace('kiss build $kissFile');
-
-        var result = _try(() -> {
-            #if profileKiss
-            Kiss.measure('Compiling kiss: $kissFile', () -> {
-            #end
-                if (k == null)
-                    k = defaultKissState(context);
-
-                k.addContextFields(useClassFields);
-                k.loadingDirectory = loadingDirectory;
-
-                var topLevelBegin = load(kissFile, k);
-
-                if (topLevelBegin != null) {
-                    // If no main function is defined manually, Kiss expressions at the top of a file will be put in a main function.
-                    // If a main function IS defined, this will result in an error
-                    if (k.fieldDict.exists("main")) {
-                        throw KissError.fromExp(topLevelBegin, '$kissFile has expressions outside of field definitions, but already defines its own main function.');
-                    }
-                    var b = topLevelBegin.expBuilder();
-                    // This doesn't need to be added to the fieldDict because all code generation is done
-                    k.fieldList.push({
-                        name: "main",
-                        access: [AStatic,APublic],
-                        kind: FFun(Helpers.makeFunction(
-                            b.symbol("main"),
-                            false,
-                            b.list([]),
-                            [topLevelBegin],
-                            k,
-                            "function",
-                            [])),
-                        pos: topLevelBegin.macroPos()
-                    });
-                }
-
-            #if profileKiss
-            });
-            for (label => timeSpent in profileAggregates) {
-                var usageCount = profileUsageCounts[label];
-                if (timeSpent >= SIGNIFICANT_TIME_SPENT) {
-                    Sys.println('${label} (x${usageCount}): ${timeSpent}');
-                }
-            }
-
-            #end
-            k.fieldList;
-        });
-        return result;
-    }
-
-    static final SIGNIFICANT_TIME_SPENT = 0.05;
-
-    public static function load(kissFile:String, k:KissState, ?loadingDirectory:String, loadAllExps = false, ?fromExp:ReaderExp):Null<ReaderExp> {
-        if (loadingDirectory == null)
-            loadingDirectory = k.loadingDirectory;
-
-        var fullPath = if (Path.isAbsolute(kissFile)) {
-            kissFile;
-        } else {
-            Path.join([loadingDirectory, kissFile]);
-        };
-        var previousFile = k.file;
-        k.file = fullPath;
-
-        if (k.loadedFiles.exists(fullPath)) {
-            return k.loadedFiles[fullPath];
-        }
-        var stream = try {
-            Stream.fromFile(fullPath);
-        } catch (m:Any) {
-            var message =  'Kiss file not found: $kissFile';
-            if (fromExp != null)
-                throw KissError.fromExp(fromExp, message);
-            Sys.println(message);
-            Sys.exit(1);
-            null;
-        }
-        var startPosition = stream.position();
-        var loadedExps = [];
-        Reader.readAndProcess(stream, k, (nextExp) -> {
-            #if test
-            Sys.println(nextExp.def.toString());
-            #end
-
-            // readerExpToHaxeExpr must be called to process readermacro, alias, and macro definitions
-            macroUsed = false;
-            var expr = readerExpToHaxeExpr(nextExp, k);
-            
-            // exps in the loaded file that actually become haxe expressions can be inserted into the
-            // file that loaded them at the position (load) was called.
-            // conditional compiler macros like (#when) tend to return empty blocks, or blocks containing empty blocks
-            // when they contain field forms, so this should also be ignored
-            
-            // When calling from build(), we can't add all expressions to the (begin) returned by (load), because that will
-            // cause double-evaluation of field forms
-            if (loadAllExps) {
-                loadedExps.push(nextExp);
-            } else if (!isEmpty(expr)) {
-                // don't double-compile macros:
-                if (macroUsed) {
-                    loadedExps.push(RawHaxe(expr.toString()).withPosOf(nextExp));
-                } else {
-                    loadedExps.push(nextExp);
-                }
-            }
-        });
-
-        var exp = if (loadedExps.length > 0) {
-            CallExp(Symbol("begin").withPos(startPosition), loadedExps).withPos(startPosition);
-        } else {
-            null;
-        }
-        k.loadedFiles[fullPath] = exp;
-        k.file = previousFile;
-        return exp;
-    }
-
-    /**
-     * Build macro: add fields to a Haxe class by compiling multiple Kiss files in order with the same KissState
-     */
-    public static function buildAll(kissFiles:Array<String>, ?k:KissState, useClassFields = true, ?context:FrontendContext):Array<Field> {
-        if (k == null)
-            k = defaultKissState(context);
-
-        k.addContextFields(useClassFields);
-
-        for (file in kissFiles) {
-            build(file, k, false, context);
-        }
-
-        return k.fieldList;
-    }
-
-    static var macroUsed = false;
-    static var expCache:haxe.DynamicAccess<String> = null;
-    static var cacheFile = ".kissCache.json";
-    static var cacheThreshold = 0.2;
-    
-    public static function readerExpToHaxeExpr(exp, k): Expr {
-        return switch (macroExpandAndConvert(exp, k, false)) {
-            case Right(expr): expr;
-            case e: throw 'macroExpandAndConvert is broken: ${e}';
-        };
-    }
-
-    public static function macroExpand(exp, k):ReaderExp {
-        return switch (macroExpandAndConvert(exp, k, true)) {
-            case Left(exp): exp;
-            case e: throw 'macroExpandAndConvert is broken: ${e}';
-        };
-    }
-
-    // Core functionality of Kiss: returns ReaderExp when macroExpandOnly is true, and haxe.macro.Expr otherwise
-    public static function macroExpandAndConvert(exp:ReaderExp, k:KissState, macroExpandOnly:Bool, ?metaNames, ?metaParams:Array<Array<Expr>>, ?metaPos:Array<haxe.macro.Position>):Either<ReaderExp,Expr> {
-        #if kissCache
-        var str = Reader.toString(exp.def);
-        if (!macroExpandOnly) {
-            if (expCache == null) {
-                expCache = if (sys.FileSystem.exists(cacheFile)) {
-                    haxe.Json.parse(File.getContent(cacheFile));
-                } else {
-                    {};
-                }
-            }
-            
-            if (expCache.exists(str)) {
-                return Right(Context.parse(expCache[str], Helpers.macroPos(exp)));
-            }
-        }
-        #end
-        
-        if (k.conversionStack.length == 0) k.stateChanged = false;
-        k.conversionStack.push(exp);
-        
-        var macros = k.macros;
-        var fieldForms = k.fieldForms;
-        var specialForms = k.specialForms;
-        var formDocs = k.formDocs;
-
-        // Bind the table arguments of this function for easy recursive calling/passing
-        var convert = macroExpandAndConvert.bind(_, k, macroExpandOnly);
-
-        function left (c:Either<ReaderExp,Expr>) {
-            return switch (c) {
-                case Left(exp): exp;
-                default: throw "macroExpandAndConvert is broken";
-            };
-        }
-
-        function right (c:Either<ReaderExp,Expr>) {
-            return switch (c) {
-                case Right(exp): exp;
-                default: throw "macroExpandAndConvert is broken";
-            };
-        }
-        
-        function leftForEach(convertedExps:Array<Either<ReaderExp,Expr>>) {
-            return convertedExps.map(left);
-        }
-
-        function rightForEach(convertedExps:Array<Either<ReaderExp,Expr>>) {
-            return convertedExps.map(right);
-        }
-
-        function checkNumArgs(form:String) {
-            if (formDocs.exists(form)) {
-                var docs = formDocs[form];
-                // null docs can get passed around by renameAndDeprecate functions. a check here is more DRY
-                if (docs != null)
-                    exp.checkNumArgs(docs.minArgs, docs.maxArgs, docs.expectedForm);
-            }
-        }
-
-        if (k.hscript)
-            exp = Helpers.removeTypeAnnotations(exp);
-
-        var none = EBlock([]).withMacroPosOf(exp);
-
-        var startTime = haxe.Timer.stamp();
-        var expr:Either<ReaderExp,Expr> = switch (exp.def) {
-            case None:
-                if (macroExpandOnly) Left(exp) else Right(none);
-            case HaxeMeta(name, params, exp):
-                if (macroExpandOnly) {
-                    Left(HaxeMeta(name, params, left(macroExpandAndConvert(exp, k, true))).withPosOf(exp));
-                } else {
-                    if (metaNames == null) metaNames = [];
-                    if (metaParams == null) metaParams = [];
-                    if (metaPos == null) metaPos = [];
-                    metaNames.push(name);
-                    if (params == null)
-                        metaParams.push(null);
-                    else
-                        metaParams.push([for (param in params) right(macroExpandAndConvert(param, k, false))]);
-                    metaPos.push(Helpers.macroPos(exp));
-                    Right(right(macroExpandAndConvert(exp, k, false, metaNames, metaParams, metaPos)));                    
-                }
-            case Symbol(alias) if (k.identAliases.exists(alias)):
-                var substitution = k.identAliases[alias].withPosOf(exp);
-                if (macroExpandOnly) Left(substitution) else macroExpandAndConvert(substitution, k, false);
-            case Symbol(name) if (!macroExpandOnly):
-                try {
-                    Right(Context.parse(name, exp.macroPos()));
-                } catch (err:haxe.Exception) {
-                    throw KissError.fromExp(exp, "invalid symbol");
-                };
-            case StrExp(s) if (!macroExpandOnly):
-                Right(EConst(CString(s)).withMacroPosOf(exp));
-            case CallExp({pos: _, def: Symbol(ff)}, args) if (fieldForms.exists(ff) && !macroExpandOnly):
-                checkNumArgs(ff);
-                var field = fieldForms[ff](exp, args.copy(), k);
-                if (metaNames != null && metaNames.length > 0) {
-                    field.meta = [];
-                    while (metaNames.length > 0) {
-                        field.meta.push({
-                            name: metaNames.shift(),
-                            params: metaParams.shift(),
-                            pos: metaPos.shift()
-                        });
-                    }
-                }
-                k.fieldList.push(field);
-                k.fieldDict[field.name] = field;
-                k.stateChanged = true;
-                Right(none); // Field forms are no-ops
-            case CallExp({pos: _, def: Symbol(mac)}, args) if (macros.exists(mac)):
-                checkNumArgs(mac);
-                macroUsed = true;
-                var expanded =
-                    #if !macrotest
-                    try {
-                    #end
-                        Kiss.measure(mac, ()->macros[mac](exp, args.copy(), k), true);
-                    #if !macrotest
-                    } catch (error:KissError) {
-                        throw error;
-                    } catch (error:Dynamic) {
-                        throw KissError.fromExp(exp, 'Macro expansion error: $error');
-                    };
-                    #end
-                    if (expanded != null) {
-                        convert(expanded);
-                    } else if (macroExpandOnly) {
-                        Left(None.withPosOf(exp));
-                    } else{
-                        Right(none);
-                    };
-            case CallExp({pos: _, def: Symbol(specialForm)}, args) if (specialForms.exists(specialForm) && !macroExpandOnly):
-                checkNumArgs(specialForm);    
-                Right(Kiss.measure(specialForm, ()->specialForms[specialForm](exp, args.copy(), k), true));
-            case CallExp({pos: _, def: Symbol(alias)}, args) if (k.callAliases.exists(alias)):
-                convert(CallExp(k.callAliases[alias].withPosOf(exp), args).withPosOf(exp));
-            case CallExp(func, args):
-                var convertedArgs = [for (argExp in args) convert(argExp)];
-                if (macroExpandOnly) {
-                    var convertedArgs = leftForEach(convertedArgs);
-                    Left(CallExp(func, convertedArgs).withPosOf(exp));
-                }
-                else {
-                    var convertedArgs = rightForEach(convertedArgs);
-                    Right(ECall(right(convert(func)), convertedArgs).withMacroPosOf(exp));
-                }
-
-            case ListExp(elements):
-                var isMap = false;
-                var convertedElements = [
-                    for (elementExp in elements) {
-                        switch (elementExp.def) {
-                            case KeyValueExp(_, _):
-                                isMap = true;
-                            default:
-                        }
-                        convert(elementExp);
-                    }
-                ];
-                if (macroExpandOnly)
-                    Left(ListExp(leftForEach(convertedElements)).withPosOf(exp));
-                else {
-                    var arrayDecl = EArrayDecl(rightForEach(convertedElements)).withMacroPosOf(exp);
-                    Right(if (!isMap && k.wrapListExps && !k.hscript) {
-                        ENew({
-                            pack: ["kiss"],
-                            name: "List"
-                        }, [arrayDecl]).withMacroPosOf(exp);
-                    } else {
-                        arrayDecl;
-                    });
-                }
-            case RawHaxe(code) if (!macroExpandOnly):
-                try {
-                    Right(Context.parse(code, exp.macroPos()));
-                } catch (err:Exception) {
-                    throw KissError.fromExp(exp, 'Haxe parse error: $err');
-                };
-            case RawHaxeBlock(code) if (!macroExpandOnly):
-                try {
-                    Right(Context.parse('{$code}', exp.macroPos()));
-                } catch (err:Exception) {
-                    throw KissError.fromExp(exp, 'Haxe parse error: $err');
-                };
-            case FieldExp(field, innerExp, safe):
-                var convertedInnerExp = convert(innerExp);
-                if (macroExpandOnly)
-                    Left(FieldExp(field, left(convertedInnerExp), safe).withPosOf(exp));
-                else
-                    Right(EField(right(convertedInnerExp), field, if (safe) Safe else Normal).withMacroPosOf(exp));
-            case KeyValueExp(keyExp, valueExp) if (!macroExpandOnly):
-                Right(EBinop(OpArrow, right(convert(keyExp)), right(convert(valueExp))).withMacroPosOf(exp));
-            case Quasiquote(innerExp) if (!macroExpandOnly):
-                // This statement actually turns into an HScript expression before running
-                Right(macro {
-                    Helpers.evalUnquotes($v{innerExp});
-                });
-            default:
-                if (macroExpandOnly)
-                    Left(exp);
-                else
-                    throw KissError.fromExp(exp, 'conversion not implemented');
-        };
-        var conversionTime = haxe.Timer.stamp() - startTime;
-        k.conversionStack.pop();
-        #if kissCache
-        if (!macroExpandOnly) {
-            if (conversionTime > cacheThreshold && !k.stateChanged) {
-                expCache[str] = switch (expr) {
-                    case Right(expr): expr.toString();
-                    default: throw "macroExpandAndConvert is broken";
-                }
-                File.saveContent(cacheFile, haxe.Json.stringify(expCache));
-            }
-        }
-        #end
-        if (metaNames != null && metaNames.length > 0 && !macroExpandOnly) {
-            expr = Right(EMeta({
-                            name: metaNames.pop(),
-                            params: metaParams.pop(),
-                            pos: metaPos.pop()
-                        }, right(expr)).withMacroPosOf(exp));
-        }
-        return expr;
-    }
-    
-    public static function addVarInScope(k: KissState, v:Var, local:Bool, isStatic:Bool=false) {
-        if (v.type != null)
-            k.typeHints.push(v);
-        k.varsInScope.push(v);
-        k.varsInScopeAreStatic.push(isStatic);
-        if (local)
-            k.localVarsInScope.push(v);
-    }
-
-    public static function removeVarInScope(k: KissState, v:Var, local:Bool) {
-        function removeLast(list:Array<Var>, v:Var) {
-            var index = list.lastIndexOf(v);
-            list.splice(index, 1);
-            return index;
-        }
-        if (v.type != null)
-            removeLast(k.typeHints, v);
-        var idx = removeLast(k.varsInScope, v);
-        k.varsInScopeAreStatic.splice(idx, 1);
-        if (local)
-            removeLast(k.localVarsInScope, v);
-    }
-
-    static function disableMacro(copy:KissState, m:String, reason:String) {
-        copy.macros[m] = (wholeExp:ReaderExp, exps, k) -> {
-            var b = wholeExp.expBuilder();
-            // have this throw during macroEXPANSION, not before (so assertThrows will catch it)
-            b.throwKissError('$m is unavailable in macros because $reason');
-        };
-    }
-
-    // This doesn't clone k because k might be modified in important ways :(
-    public static function forStaticFunction(k:KissState, inStaticFunction:Bool) {
-        k.inStaticFunction = inStaticFunction;
-        return k;
-    }
-
-    // Return an identical Kiss State, but without type annotations or wrapping list expressions as kiss.List constructor calls.
-    public static function forHScript(k:KissState):KissState {
-        var copy = new Cloner().clone(k);
-        copy.hscript = true;
-
-        // disallow macros that will error when run in hscript:
-        disableMacro(copy, "ifLet", "hscript doesn't support pattern-matching");
-        disableMacro(copy, "whenLet", "hscript doesn't support pattern-matching");
-        disableMacro(copy, "unlessLet", "hscript doesn't support pattern-matching");
-
-        copy.macros["cast"] = (wholeExp:ReaderExp, exps, k) -> {
-            exps[0];
-        };
-
-        return copy;
-    }
-
-    public static function forMacroEval(k:KissState): KissState {
-        var copy = k.forHScript();
-        // Catch accidental misuse of (set) on macroVars
-        var setLocal = copy.specialForms["set"];
-        copy.specialForms["set"] = (wholeExp:ReaderExp, exps, k:KissState) -> {
-            switch (exps[0].def) {
-                case Symbol(varName) if (k.macroVars.exists(varName)):
-                    var b = wholeExp.expBuilder();
-                    // have this throw during macroEXPANSION, not before (so assertThrows will catch it)
-                    copy.convert(b.throwKissError('If you intend to change macroVar $varName, use setMacroVar instead. If not, rename your local variable for clarity.'));
-                default:
-                    setLocal(wholeExp, exps, copy);
-            };
-        };
-
-        copy.macros["expect"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            wholeExp.checkNumArgs(3, null, "(expect <stream> <description> <stream method> <args...>)");
-            var b = wholeExp.expBuilder();
-            var streamSymbol = exps.shift();
-            b.callField("expect", streamSymbol, [exps.shift(), b.callSymbol("lambda", [b.list([]), b.callField(Prelude.symbolNameValue(exps.shift()), streamSymbol, exps)])]);
-        };
-
-        // TODO should this also be in forHScript()?
-        // In macro evaluation,  
-        copy.macros.remove("eval");
-        // BECAUSE it is provided as a function instead.
-
-        return copy;
-    }
-
-    // Return an identical Kiss State, but without wrapping list expressions as kiss.List constructor calls.
-    public static function withoutListWrapping(k:KissState) {
-        var copy = new Cloner().clone(k);
-        copy.wrapListExps = false;
-        return copy;
-    }
-
-    // Return an identical Kiss State, but prepared for parsing a branch pattern of a (case...) expression
-    public static function forCaseParsing(k:KissState):KissState {
-        var copy = withoutListWrapping(k);
-        copy.macros.remove("or");
-        copy.specialForms["or"] = SpecialForms.caseOr;
-        copy.specialForms["as"] = SpecialForms.caseAs;
-        return copy;
-    }
-
-    public static function convert(k:KissState, exp:ReaderExp) {
-        return readerExpToHaxeExpr(exp, k);
-    }
-
-    public static function localVarWarning(k:KissState) {
-        if (k.localVarCalls.length > 0 && k.printFieldsCalls.length > 0) {
-            for (call in k.localVarCalls) {
-                KissError.warnFromExp(call, 'variables declared with with `localVar` are incompatible with printAll macros. Use `let` instead.');
-            }
-            k.localVarCalls = [];
-        }
-    }
-
-    static var profileAggregates:Map<String,Float> = [];
-    static var profileUsageCounts:Map<String,Int> = [];
-
-    public static function measure<T>(processLabel:String,  process:Void->T, aggregate=false) {
-        var start = Sys.time();
-        if (aggregate) {
-            if (!profileAggregates.exists(processLabel)) {
-                profileAggregates[processLabel] = 0.0;
-                profileUsageCounts[processLabel] = 0;
-            }
-        } else {
-            Sys.print('${processLabel}... ');
-        }
-        var result = process();
-        var end = Sys.time();
-        if (aggregate) {
-            profileAggregates[processLabel] += (end - start);
-            profileUsageCounts[processLabel] += 1;
-        } else {
-            Sys.println('${end-start}s');
-        }
-        return result;
-    }
-
-    public static function isEmpty(expr:Expr) {
-        switch (expr.expr) {
-            case EBlock([]):
-            case EBlock(blockExps):
-                for (exp in blockExps) {
-                    if (!isEmpty(exp))
-                        return false;
-                }
-            default:
-                return false;
-        }
-        return true;
-    }
-
-    #end
-}
diff --git a/kiss/src/kiss/KissError.hx b/kiss/src/kiss/KissError.hx
deleted file mode 100644
index e54c4f57..00000000
--- a/kiss/src/kiss/KissError.hx
+++ /dev/null
@@ -1,70 +0,0 @@
-package kiss;
-
-import kiss.Reader;
-import kiss.List;
-
-using kiss.Stream;
-using kiss.Reader;
-
-enum ErrorType {
-    CantCompile;
-    CompileWarning;
-    AssertionFail;
-}
-
-// Internal Kiss errors
-class KissError {
-    var exps:List<ReaderExp>;
-    var message:String;
-
-    public function new(exps:Array<ReaderExp>, message:String) {
-        this.exps = exps;
-        this.message = message;
-    }
-
-    public static function fromExp(exp:ReaderExp, message:String) {
-        return new KissError([exp], message);
-    }
-
-    public static function fromExpStr(pos:Position, expStr:String, message:String) {
-        switch (Reader.read(Stream.fromString(expStr), Kiss.defaultKissState())) {
-            case Some(exp):
-                return fromExp({pos: pos, def: exp.def}, message);
-            default:
-                throw 'bad'; // TODO better message
-        }
-    }
-
-    public static function fromArgs(exps:Array<ReaderExp>, message:String) {
-        return new KissError(exps, message);
-    }
-
-    public function toString(type = CantCompile) {
-        var posPrefix = switch (exps.length) {
-            case 1:
-                exps[0].pos.toPrint();
-            default:
-                var firstPos = exps[0].pos.toPrint();
-                var lastPos = exps[-1].pos.toPrint();
-                var justLineAndColumnIdx = lastPos.indexOf(":") + 1;
-                firstPos + '-' + lastPos.substr(justLineAndColumnIdx);
-        }
-
-        var typePrefix = switch (type) {
-            case CantCompile:
-                "Kiss compilation failed";
-            case CompileWarning:
-                "Kiss compilation warning";
-            case AssertionFail:
-                "Assertion failed";
-        };
-
-        return '$posPrefix: $typePrefix: $message'
-            + "\nFrom:"
-            + [for (exp in exps) exp.def.toString()].toString();
-    }
-
-    public static function warnFromExp(exp:ReaderExp, message:String) {
-        Prelude.print(new KissError([exp], message).toString(CompileWarning));
-    }
-}
diff --git a/kiss/src/kiss/KissFrontend.hx b/kiss/src/kiss/KissFrontend.hx
deleted file mode 100644
index fba59a48..00000000
--- a/kiss/src/kiss/KissFrontend.hx
+++ /dev/null
@@ -1,54 +0,0 @@
-package kiss;
-
-import kiss.Kiss;
-import tink.syntaxhub.*;
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.Expr.ImportMode;
-using StringTools;
-
-class KissFrontend implements FrontendPlugin {
-	
-	var extension:String;
-	var dslFile:String;
-	public function new(extension = "kiss", dslFile = "") {
-		this.extension = extension;
-		this.dslFile = dslFile;
-	}
-	
-	public function extensions() {
-		return [extension].iterator();
-	}
-	
-	public function parse(file:String, context:FrontendContext):Void {
-
-		var files = [file];
-		if (dslFile.length > 0) {
-			files.unshift(dslFile);
-		}
-
-		final fields = Kiss.buildAll(files,null,false,context);
-		#if debug
-			trace(context.name);
-		#end 
-		final type = context.getType();
-		var pos = Context.makePosition({ file: file, min: 0, max: 0 });
-		context.addImport('kiss.Prelude',INormal,pos);
-		context.addImport('haxe.ds.Option',INormal,pos);
-		context.addUsing('StringTools',pos);
-		for (field in fields) {
-			type.fields.push(field);
-		}
-	}
-
-	static function use() {
-		tink.SyntaxHub.frontends.whenever(new KissFrontend());
-	}
-	
-	static function dsl(extension:String, dslFile:String) {
-		if (extension.startsWith(".")) {
-			extension = extension.substr(1);
-		}
-		tink.SyntaxHub.frontends.whenever(new KissFrontend(extension, dslFile));
-	}
-}
\ No newline at end of file
diff --git a/kiss/src/kiss/KissInterp.hx b/kiss/src/kiss/KissInterp.hx
deleted file mode 100644
index 0f8a3ad2..00000000
--- a/kiss/src/kiss/KissInterp.hx
+++ /dev/null
@@ -1,138 +0,0 @@
-package kiss;
-
-import hscript.Parser;
-import hscript.Interp;
-import hscript.Expr;
-import kiss.Prelude;
-
-using  hscript.Tools;
-
-typedef InterpMap = haxe.ds.StringMap<Dynamic>;
-
-/**
- * Specialized hscript interpreter for hscript generated from Kiss expressions.
- * When macrotest is defined by the compiler, many functions run without
- * try/catch statements that are required for correct behavior -- this
- * is actually helpful sometimes because it preserves callstacks from errors in
- * macro definitions.
- */
-class KissInterp extends Interp {
-    var nullForUnknownVar:Bool;
-    var parser = new Parser();
-
-    // TODO standardize this with KissConfig.prepareInterp
-    public function new(nullForUnknownVar = false) {
-        super();
-
-        this.nullForUnknownVar = nullForUnknownVar;
-
-        variables.set("Reflect", Reflect);
-        variables.set("Type", Type);
-        variables.set("Prelude", Prelude);
-        variables.set("Lambda", Lambda);
-        variables.set("Std", Std);
-        variables.set("Keep", ExtraElementHandling.Keep);
-        variables.set("Drop", ExtraElementHandling.Drop);
-        variables.set("Throw", ExtraElementHandling.Throw);
-        variables.set("Math", Math);
-        variables.set("Json", haxe.Json);
-        variables.set("StringMap", InterpMap);
-        variables.set("FuzzyMapTools", FuzzyMapTools);
-        variables.set("StringTools", StringTools);
-        variables.set("Path", haxe.io.Path);
-        #if (sys || hxnodejs)
-        variables.set("Sys", Sys);
-        variables.set("FileSystem", sys.FileSystem);
-        variables.set("File", sys.io.File);
-        #end
-        #if (sys && !cs)
-        variables.set("Http", sys.Http);
-        #end
-
-        #if macro
-        variables.set("KissError", kiss.KissError);
-        #end
-
-        // Might eventually need to simulate types in the namespace:
-        variables.set("kiss", {});
-    }
-
-    public var cacheConvertedHScript = false;
-
-    public function evalKiss(kissStr:String):Dynamic {
-        #if !(sys || hxnodejs)
-        if (cacheConvertedHScript) {
-            throw "Cannot used cacheConvertedHScript on a non-sys target";
-        }
-        #end
-
-        var convert =
-            #if (sys || hxnodejs)
-            if (cacheConvertedHScript) {
-                Prelude.cachedConvertToHScript;
-            } else
-            #end
-                Prelude.convertToHScript;
-        return evalHaxe(convert(kissStr));
-    }
-
-    public function evalHaxe(hscriptStr:String):Dynamic {
-        return execute(parser.parseString(hscriptStr));
-    }
-
-    // In some contexts, undefined variables should just return "null" as a falsy value
-    override function resolve(id:String):Dynamic {
-        if (nullForUnknownVar) {
-            return try {
-                super.resolve(id);
-            } catch (e:Dynamic) {
-                null;
-            }
-        } else {
-            return super.resolve(id);
-        }
-    }
-
-    override function exprReturn(e):Dynamic {
-        // the default exprReturn() contains a try-catch which, though it is important (break, continue, and return statements require it), hides very important macroexpansion callstacks sometimes
-        #if macrotest
-        return expr(e);
-        #else
-        return super.exprReturn(e);
-        #end
-    }
-
-    #if macrotest
-    override function forLoop(n, it, e) {
-        var old = declared.length;
-        declared.push({n: n, old: locals.get(n)});
-        var it = makeIterator(expr(it));
-        while (it.hasNext()) {
-            locals.set(n, {r: it.next()});
-            // try {
-            expr(e);
-            /*} catch( err : Stop ) {
-                switch( err ) {
-                case SContinue:
-                case SBreak: break;
-                case SReturn: throw err;
-                }
-            }*/
-        }
-        restore(old);
-    }
-    #end
-    
-    public function publicExprReturn(e) {
-        return exprReturn(e);
-    }
-
-    public function getLocals() {
-        return locals;
-    }
-
-    public function setLocals(l) {
-        locals = l;
-    }
-
-}
diff --git a/kiss/src/kiss/List.hx b/kiss/src/kiss/List.hx
deleted file mode 100644
index 9e340f36..00000000
--- a/kiss/src/kiss/List.hx
+++ /dev/null
@@ -1,56 +0,0 @@
-package kiss;
-
-/**
-    Kiss enhances Haxe Arrays to support negative indices and return nullable-typed values.
-**/
-@:forward(length, concat, contains, copy, filter, indexOf, // insert is re-implemented with negative index support
-    iterator, join, keyValueIterator,
-    lastIndexOf, map, pop, push, remove, resize, reverse, shift, // slice is re-implemented with negative index support
-    sort,
-    // splice is re-implemented with negative index support,
-    toString, unshift)
-abstract List<T>(Array<T>) from Array<T> to Array<T> {
-    public inline function new(a:Array<T>) {
-        this = a;
-    }
-
-    @:from
-    static public function fromArray<T>(a:Array<T>) {
-        return new List<T>(a);
-    }
-
-    @:to
-    public function toArray() {
-        return this;
-    }
-
-    inline function realIndex(idx:Int) {
-        return if (idx < 0) this.length + idx else idx;
-    }
-
-    @:arrayAccess
-    public inline function get(idx:Int):Null<T> {
-        return this[realIndex(idx)];
-    }
-
-    @:arrayAccess
-    public inline function arrayWrite(idx:Int, v:T):T {
-        this[realIndex(idx)] = v;
-        return v;
-    }
-
-    // TODO deleting these should be fine, because the haxe Array functions already allow negative arguments
-    public function insert(idx:Int, v:T) {
-        this.insert(realIndex(idx), v);
-    }
-
-    public function slice(start:Int, ?end:Int) {
-        if (end == null)
-            end = this.length;
-        return this.slice(realIndex(start), realIndex(end));
-    }
-
-    public function splice(start:Int, len:Int) {
-        return this.splice(realIndex(start), len);
-    }
-}
diff --git a/kiss/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx
deleted file mode 100644
index 2263f947..00000000
--- a/kiss/src/kiss/Macros.hx
+++ /dev/null
@@ -1,1679 +0,0 @@
-package kiss;
-
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import kiss.Reader;
-import kiss.ReaderExp;
-import kiss.Kiss;
-import kiss.KissError;
-import kiss.CompilerTools;
-import uuid.Uuid;
-import hscript.Parser;
-import haxe.EnumTools;
-
-using kiss.Kiss;
-using kiss.Prelude;
-using kiss.Reader;
-using kiss.Helpers;
-using StringTools;
-using tink.MacroApi;
-
-// Macros generate new Kiss reader expressions from the arguments of their call expression.
-typedef MacroFunction = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> Null<ReaderExp>;
-
-class Macros {
-    static var MACRO_RECURSION_LIMIT = 10;
-
-    public static function builtins(k:KissState) {
-        var macros:Map<String, MacroFunction> = [];
-
-        function renameAndDeprecate(oldName:String, newName:String) {
-            var form = macros[oldName];
-            macros[oldName] = (wholeExp, args, k) -> {
-                KissError.warnFromExp(wholeExp, '$oldName has been renamed to $newName and deprecated');
-                form(wholeExp, args, k);
-            }
-            macros[newName] = form;
-            k.formDocs[newName] = k.formDocs[oldName];
-        }
-
-        var compileTimeResolveToString = Helpers.compileTimeResolveToString;
-
-        k.doc("load", 1, 1, '(load "<file.kiss>")');
-        macros["load"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            Kiss.load(compileTimeResolveToString("The only argument to (load...)", "a .kiss file path", args[0], k), k, null, false, wholeExp);
-        };
-
-        k.doc("loadFrom", 2, 2, '(loadFrom "<haxelib name>" "<file.kiss>")');
-        macros["loadFrom"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var libName = compileTimeResolveToString("The first argument to (loadFrom...)", "a haxe library's name", args[0], k);
-            var libPath = Prelude.libPath(libName);
-            var otherKissFile = compileTimeResolveToString("The second argument to (loadFrom...)", "a .kiss file path", args[1], k);
-            Kiss.load(otherKissFile, k, libPath, false, wholeExp);
-        };
-
-        function destructiveVersion(op:String, assignOp:String) {
-            k.doc(assignOp, 2, null, '($assignOp <var> <v1> <values...>)');
-            macros[assignOp] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
-                var b = wholeExp.expBuilder();
-                b.call(
-                    b.symbol("set"), [
-                        exps[0],
-                        b.call(
-                            b.symbol(op),
-                            exps)
-                    ]);
-            };
-        }
-
-        destructiveVersion("%", "%=");
-        destructiveVersion("^", "^=");
-        destructiveVersion("+", "+=");
-        destructiveVersion("-", "-=");
-        destructiveVersion("*", "*=");
-        destructiveVersion("/", "/=");
-
-        var opAliases = [
-            // These shouldn't be ident aliases because they are common variable names
-            "min" => "Prelude.min",
-            "max" => "Prelude.max",
-            // These might not be common, but playing it safe:
-            "iHalf" => "Prelude.iHalf",
-            "iThird" => "Prelude.iThird",
-            "iFourth" => "Prelude.iFourth",
-            "iFifth" => "Prelude.iFifth",
-            "iSixth" => "Prelude.iSixth",
-            "iSeventh" => "Prelude.iSeventh",
-            "iEighth" => "Prelude.iEighth",
-            "iNinth" => "Prelude.iNinth",
-            "iTenth" => "Prelude.iTenth",
-            "fHalf" => "Prelude.fHalf",
-            "fThird" => "Prelude.fThird",
-            "fFourth" => "Prelude.fFourth",
-            "fFifth" => "Prelude.fFifth",
-            "fSixth" => "Prelude.fSixth",
-            "fSeventh" => "Prelude.fSeventh",
-            "fEighth" => "Prelude.fEighth",
-            "fNinth" => "Prelude.fNinth",
-            "fTenth" => "Prelude.fTenth",
-            // These can't be ident aliases because they would supercede the typed call macros that wrap them:
-            "zip" => "Prelude.zipThrow",
-            "zipThrow" => "Prelude.zipThrow",
-            "zipKeep" => "Prelude.zipKeep",
-            "zipDrop" => "Prelude.zipDrop",
-            "concat" => "Prelude.concat",
-            "intersect" => "Prelude.intersect",
-            "and" => "Prelude.and",
-            "or" => "Prelude.or"
-        ];
-        k.doc("apply", 2, 2, '(apply <func> <argList>)' );
-        macros["apply"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
-            var b = wholeExp.expBuilder();
-            var isSafe = false;
-            var callOn = switch (exps[0].def) {
-                case FieldExp(field, exp, safe):
-                    isSafe = safe;
-                    exp;
-                default:
-                    b.symbol("null");
-            };
-            var func = switch (exps[0].def) {
-                case Symbol(func) if (opAliases.exists(func)):
-                    b.symbol(opAliases[func]);
-                default:
-                    exps[0];
-            };
-            var args = exps[1];
-            var exp = b.call(
-                b.symbol("Reflect.callMethod"), [
-                    callOn, func, args
-                ]);
-
-            if (isSafe)
-                exp = b.callSymbol("when", [callOn, exp]);
-
-            exp;
-        };
-
-        k.doc("range", 1, 3, '(range <?min> <max> <?step>)');
-        macros["range"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
-            var b = wholeExp.expBuilder();
-            var min = if (exps.length > 1) exps[0] else b.symbol("0");
-            var max = if (exps.length > 1) exps[1] else exps[0];
-            var step = if (exps.length > 2) exps[2] else b.symbol("1");
-            b.callSymbol("Prelude.range", [min, max, step]);
-        };
-
-        function prepareForConditional(i:KissInterp, k:KissState) {
-            i.variables.set("kissFile", k.file);
-            i.variables.set("className", k.className);
-            for (flag => value in Context.getDefines()) {
-                // Don't overwrite types that are put in all KissInterps, i.e. the kiss namespace
-                if (!i.variables.exists(flag)) {
-                    i.variables.set(flag, value);
-                }
-            }
-           for (macroVar => value in k.macroVars) {
-                // Don't overwrite types that are put in all KissInterps, i.e. the kiss namespace
-                if (!i.variables.exists(macroVar)) {
-                    i.variables.set(macroVar, value);
-                }
-            }
-        }
-
-        // Most conditional compilation macros are based on this macro:
-        k.doc("#if", 2, 3, '(#if <cond> <then> <?else>)' );
-        macros["#if"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
-            var b = wholeExp.expBuilder();
-            var conditionExp = exps.shift();
-            var thenExp = exps.shift();
-            var elseExp = if (exps.length > 0) exps.shift(); else b.none();
-
-            var conditionInterp = new KissInterp(true);
-            var conditionStr = Reader.toString(conditionExp.def);
-            prepareForConditional(conditionInterp, k);
-            try {
-                var hscriptStr = Prelude.convertToHScript(conditionStr);
-                // TODO are there more properties of target that need to be added?
-                // Context.definedValue only returns a string so if there's a whole
-                // object, I don't know how to get it
-                conditionInterp.variables["target"] = {
-                    threaded: Context.defined("target.threaded")
-                };
-                #if test
-                Prelude.print("#if condition hscript: " + hscriptStr);
-                #end
-                return if (Prelude.truthy(conditionInterp.evalHaxe(hscriptStr))) {
-                    #if test
-                    Prelude.print("using thenExp");
-                    #end
-                    thenExp;
-                } else {
-                    #if test
-                    Prelude.print("using elseExp");
-                    #end
-                    elseExp;
-                }
-            } catch (e) {
-                throw KissError.fromExp(conditionExp, 'condition for #if threw error $e');
-            }
-        };
-
-        // But not this one:
-        k.doc("#case", 2, null, '(#case <expression> <cases...> <optional: (otherwise <default>)>)');
-        macros["#case"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k) -> {
-            var b = wholeExp.expBuilder();
-            var caseVar = exps.shift();
-            var matchPatterns = [];
-            var matchBodies = [];
-            var matchBodySymbols = [];
-            var caseArgs = [caseVar];
-            for (exp in exps) {
-                switch (exp.def) {
-                    case CallExp(pattern, bodyExps):
-                        matchPatterns.push(pattern);
-                        matchBodies.push(b.begin(bodyExps));
-                        var gensym = b.symbol();
-                        matchBodySymbols.push(gensym);
-                        caseArgs.push(b.call(pattern, [gensym]));
-                    default:
-                        throw KissError.fromExp(exp, "invalid pattern expression for #case");
-                }
-            }
-
-            var caseExp = b.callSymbol("case", caseArgs);
-
-            var caseInterp = new KissInterp();
-            var caseStr = Reader.toString(caseExp.def);
-            for (matchBodySymbol in matchBodySymbols) {
-                caseInterp.variables.set(Prelude.symbolNameValue(matchBodySymbol), matchBodies.shift());
-            }
-            prepareForConditional(caseInterp, k);
-            try {
-                var hscriptStr = Prelude.convertToHScript(caseStr);
-                #if test
-                Prelude.print("#case hscript: " + hscriptStr);
-                #end
-                return caseInterp.evalHaxe(hscriptStr);
-            } catch (e) {
-                throw KissError.fromExp(caseExp, '#case evaluation threw error $e');
-            }
-        }
-
-        function addBodyIf(keywordName:String, underlyingIf:String, negated:Bool) {
-            k.doc(keywordName, 2, null, '($keywordName <condition> <body...>)');
-            macros[keywordName] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k) -> {
-                var b = wholeExp.expBuilder();
-                var condition = if (negated) {
-                    b.call(
-                        b.symbol("not"), [
-                            args[0]
-                        ]);
-                } else {
-                    args[0];
-                }
-                return b.call(b.symbol(underlyingIf), [
-                    condition,
-                    b.begin(args.slice(1))
-                ]);
-            };
-        }
-        addBodyIf("when", "if", false);
-        addBodyIf("unless", "if", true);
-        addBodyIf("#when", "#if", false);
-        addBodyIf("#unless", "#if", true);
-        
-        addCond(k, macros, "cond", "if");
-        addCond(k, macros, "#cond", "#if");
-
-        k.doc("#value", 1, 1, '(#value "<name>")');
-        macros["#value"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.str(Context.definedValue(compileTimeResolveToString("The only argument to (#value...)", "a compiler flag's name", args[0], k)));
-        };
-        
-        k.doc("#symbol", 1, 1, '(#symbol "<name>")');
-        macros["#symbol"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.symbol(Context.definedValue(compileTimeResolveToString("The only argument to (#symbol...)", "a compiler flag's name", args[0], k)));
-        };
-
-        k.doc("or", 1, null, "(or <v1> <values...>)");
-        function _or(wholeExp:ReaderExp, args:Array<ReaderExp>, k) {
-            var b = wholeExp.expBuilder();
-
-            var uniqueVarSymbol = b.symbol();
-            var firstVal = args.shift();
-
-            var body = if (args.length > 0) {
-                [
-                    b.callSymbol("if", [uniqueVarSymbol, uniqueVarSymbol, _or(wholeExp, args, k)])
-                ];
-            } else {
-                // If nothing is truthy, return the last one
-                [uniqueVarSymbol];
-            };
-
-            return b.let([b.typed("Dynamic", uniqueVarSymbol), firstVal], body);
-        };
-       
-
-        macros["or"] = _or;
-
-        k.doc("and", 1, null, "(and <v1> <values...>)");
-        function _and(wholeExp:ReaderExp, args:Array<ReaderExp>, k) {
-            var b = wholeExp.expBuilder();
-            var uniqueVarSymbol = b.symbol();
-            var firstVal = args.shift();
-
-            var body = if (args.length > 0) {
-                [
-                    b.callSymbol("if", [uniqueVarSymbol, _and(wholeExp, args, k), uniqueVarSymbol])
-                ];
-            } else {
-                // If nothing is truthy, return the last one
-                [uniqueVarSymbol];
-            };
-
-            return b.let([b.typed("Dynamic", uniqueVarSymbol), firstVal], body);
-
-        }
-
-        macros["and"] = _and;
-
-        function arraySet(wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            var b = wholeExp.expBuilder();
-            var value = exps.pop();
-            return b.call(
-                b.symbol("set"), [
-                    b.call(b.symbol("nth"), exps),
-                    value
-                ]);
-        }
-        k.doc("setNth", 3, null, "(setNth <list> <index> <?n-dimensional indices...> <value>)");
-        macros["setNth"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            arraySet(wholeExp, exps, k);
-        };
-        k.doc("dictSet", 3, 3, "(dictSet <dict> <key> <value>)");
-        macros["dictSet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            arraySet(wholeExp, exps, k);
-        };
-
-        k.doc("assert", 1, 2, "(assert <expression> <?failure message>)");
-        macros["assert"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var expression = exps[0];
-            
-            var letVal = b.symbol();
-            b.callSymbol("let", [
-                b.list([
-                    letVal,
-                    expression
-                ]),
-                b.callSymbol("if", [
-                    letVal,
-                    letVal,
-                    b.throwAssertionError()
-                ])
-            ]);
-        };
-        k.doc("assertThrows", 1, 2, "(assertThrows <expression> <?failure message>)");
-        macros["assertThrows"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var expression = exps[0];
-            var basicMessage = '${expression.def.toString()} should have thrown an error';
-            var messageExp = b.str(basicMessage);
-
-            b.callSymbol("try", [
-                b.begin([expression, b.callSymbol("throw", [messageExp])]),
-                b.callSymbol("catch", [b.list([b.typed("Dynamic", b.symbol("error"))]),
-                    b.callSymbol("if", [b.callSymbol("=", [b.symbol("error"), messageExp]),
-                            b.throwAssertionError(),
-                        b.symbol("true")])])
-            ]);
-        };
-
-        k.doc("assertThrowsAtCompileTime", 1, 2, "(assertThrowsAtCompileTime <expression> <?failure message>)");
-        macros["assertThrowsAtCompileTime"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            try {
-                k.convert(exps[0]);
-                b.throwAssertionError();
-            } catch (e) {
-                b.none();
-            }
-        };
-
-        k.doc("assertEquals", 2, null, "(assertEquals <expected> <actual> <?more actual...>)");
-        macros["assertEquals"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.callSymbol("assert", [b.callSymbol("=", exps)]);
-        }
-
-        function stringsThatMatch(exp:ReaderExp, formName:String) {
-            return switch (exp.def) {
-                case StrExp(s):
-                    [s];
-                case ListExp(strings):
-                    [
-                        for (s in strings)
-                            switch (s.def) {
-                                case StrExp(s):
-                                    s;
-                                default:
-                                    throw KissError.fromExp(s, 'initiator list of $formName must only contain strings');
-                            }
-                    ];
-                default:
-                    throw KissError.fromExp(exp, 'first argument to $formName should be a String or list of strings');
-            };
-        }
-        
-        k.doc("defmacro", 3, null, '(defMacro <name> [<args...>] <body...>)');
-        macros["defmacro"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = switch (exps[0].def) {
-                case Symbol(name): name;
-                default: throw KissError.fromExp(exps[0], "macro name should be a symbol");
-            };
-
-            var argList = switch (exps[1].def) {
-                case ListExp(macroArgs): macroArgs;
-                case CallExp(_, _):
-                    throw KissError.fromExp(exps[1], 'expected a macro argument list. Change the parens () to brackets []');
-                default:
-                    throw KissError.fromExp(exps[1], 'expected a macro argument list');
-            };
-
-            // This is similar to &opt and &rest processing done by Helpers.makeFunction()
-            // but combining them would probably make things less readable and harder
-            // to maintain, because defmacro makes an actual function, not a function definition
-            var minArgs = 0;
-            var maxArgs = 0;
-            // Once the &opt meta appears, all following arguments are optional until &rest
-            var optIndex = -1;
-            // Once the &rest or &body meta appears, no other arguments can be declared
-            var restIndex = -1;
-            var requireRest = false;
-            var argNames = [];
-
-            var macroCallForm = '($name';
-
-            var builderName:String = null;
-            for (arg in argList) {
-                
-                switch (arg.def) {
-                    case MetaExp("builder", {pos: _, def: Symbol(name)}):
-                        if (builderName == null) {
-                            builderName = name;
-                        } else {
-                            throw KissError.fromExp(arg, 'Cannot declare multiple &builder args. Already declared: $builderName');
-                        }
-                    default:
-                        if (restIndex != -1) {
-                            throw KissError.fromExp(arg, "macros cannot declare arguments after a &rest or &body argument");
-                        }
-                        switch (arg.def) {
-                            case Symbol(name):
-                                argNames.push(name);
-                                if (optIndex == -1) {
-                                    ++minArgs;
-                                    macroCallForm += ' <$name>';
-                                } else {
-                                    macroCallForm += ' <?$name>';
-                                }
-                                ++maxArgs;
-                            
-                            case MetaExp("opt", {pos: _, def: Symbol(name)}):
-                                argNames.push(name);
-                                macroCallForm += ' <?$name>';
-                                optIndex = maxArgs;
-                                ++maxArgs;
-                            case MetaExp("rest", {pos: _, def: Symbol(name)}):
-                                if (name == "body") {
-                                    KissError.warnFromExp(arg, "Consider using &body instead of &rest when writing macros with bodies.");
-                                }
-                                argNames.push(name);
-                                macroCallForm += ' <$name...>';
-                                restIndex = maxArgs;
-                                maxArgs = null;
-                            case MetaExp("body", {pos: _, def: Symbol(name)}):
-                                argNames.push(name);
-                                macroCallForm += ' <$name...>';
-                                restIndex = maxArgs;
-                                requireRest = true;
-                                maxArgs = null;
-                            default:
-                                throw KissError.fromExp(arg, "macro argument should be an untyped symbol or a symbol annotated with &opt, &rest, &body or &builder");
-                        }
-                }
-            }
-
-            macroCallForm += ')';
-            if (optIndex == -1) {
-                optIndex = minArgs;
-            } else if (restIndex == -1) {
-                restIndex = optIndex + 1;
-            }
-            if (restIndex == -1)
-                restIndex = optIndex;
-
-            k.doc(name, minArgs, maxArgs, macroCallForm);
-            macros[name] = (wholeExp:ReaderExp, innerExps:Array<ReaderExp>, k:KissState) -> {
-                var b = wholeExp.expBuilder();
-                var innerArgNames = argNames.copy();
-
-                var args:Map<String, Dynamic> = [];
-                if (builderName != null) {
-                    args[builderName] = b;
-                }
-                for (idx in 0...optIndex) {
-                    args[innerArgNames.shift()] = innerExps[idx];
-                }
-                for (idx in optIndex...restIndex) {
-                    args[innerArgNames.shift()] = if (exps.length > idx) innerExps[idx] else null;
-                }
-                if (innerArgNames.length > 0) {
-                    var restArgs = innerExps.slice(restIndex);
-                    if (requireRest && restArgs.length == 0) {
-                        throw KissError.fromExp(wholeExp, 'Macro $name requires one or more expression for &body');
-                    }
-                    args[innerArgNames.shift()] = restArgs;
-                }
-
-                return Helpers.runAtCompileTime(b.callSymbol("begin", exps.slice(2)), k, args);
-            };
-
-            null;
-        };
-        renameAndDeprecate("defmacro", "defMacro");
-
-        k.doc("undefmacro", 1, 1, '(undefMacro <name>)');
-        macros["undefmacro"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = switch (exps[0].def) {
-                case Symbol(name): name;
-                default: throw KissError.fromExp(exps[0], "macro name should be a symbol");
-            };
-
-            k.macros.remove(name);
-            null;
-        };
-        renameAndDeprecate("undefmacro", "undefMacro");
-
-        k.doc("defreadermacro", 3, null, '(defReaderMacro <optional &start> <"<startingString>" or [<startingStrings...>]> [<streamArgName>] <body...>)');
-        macros["defreadermacro"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-
-            // reader macros declared in the form (defreadermacro &start ...) will only be applied
-            // at the beginning of lines
-            var table = k.readTable;
-
-            // reader macros can define a list of strings that will trigger the macro. When there are multiple,
-            // the macro will put back the initiating string into the stream so you can check which one it was
-            var strings = switch (exps[0].def) {
-                case MetaExp("start", stringsExp):
-                    table = k.startOfLineReadTable;
-                    stringsThatMatch(stringsExp, "defReaderMacro");
-                case MetaExp("bof", stringsExp):
-                    table = k.startOfFileReadTable;
-                    stringsThatMatch(stringsExp, "defReaderMacro");
-                case MetaExp("eof", stringsExp):
-                    table = k.endOfFileReadTable;
-                    stringsThatMatch(stringsExp, "defReaderMacro");
-                default:
-                    stringsThatMatch(exps[0], "defReaderMacro");
-            };
-
-            var streamArgName = null;
-            var builderArgName = null;
-            var messageForBadArgs = KissError.fromExp(exps[1], 'expected an argument list for a reader macro, like [stream] or [stream &builder b]');
-            switch (exps[1].def) {
-                case ListExp(args):
-                    for (arg in args) {
-                        switch (arg.def) {
-                            case Symbol(s):
-                                streamArgName = s;
-                            case MetaExp("builder", { pos: _, def: Symbol(b) }):
-                                if (builderArgName == null) {
-                                    builderArgName = b;
-                                } else {
-                                    throw KissError.fromExp(arg, 'Cannot declare multiple &builder args. Already declared: $builderArgName');
-                                }
-                            default:
-                                throw messageForBadArgs;
-                        }
-                    }
-                default:
-                    throw messageForBadArgs;
-            }
-            if (streamArgName == null) throw messageForBadArgs;
-
-            for (s in strings) {
-                table[s] = (stream, k) -> {
-                    if (strings.length > 1) {
-                        stream.putBackString(s);
-                    }
-                    var startingPos = stream.position();
-                    var body = CallExp(Symbol("begin").withPos(startingPos), exps.slice(2)).withPos(startingPos);
-                    var evalArgs:Map<String,Dynamic> = [streamArgName => stream];
-                    if (builderArgName != null) evalArgs[builderArgName] = body.expBuilder();
-                    try {
-                        Helpers.runAtCompileTime(body, k, evalArgs).def;
-                    } catch (err) {
-                        var expForError = Symbol(s).withPos(startingPos);
-                        KissError.warnFromExp(wholeExp, 'Error from this reader macro');
-                        throw KissError.fromExp(expForError, '$err');
-                    }
-                };
-            }
-
-            return null;
-        };
-        renameAndDeprecate("defreadermacro", "defReaderMacro");
-
-        k.doc("undefreadermacro", 1, 1, '(undefReaderMacro <optional &start> ["<startingString>" or <startingStrings...>])');
-        macros["undefreadermacro"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            // reader macros undeclared in the form (undefReaderMacro &start ...) will be removed from the table
-            // for reader macros that must be at the beginning of lines
-            // at the beginning of lines
-            var table = k.readTable;
-
-            // reader macros can define a list of strings that will trigger the macro. When there are multiple,
-            // this macro will undefine all of them
-            var strings = switch (exps[0].def) {
-                case MetaExp("start", stringsExp):
-                    table = k.startOfLineReadTable;
-                    stringsThatMatch(stringsExp, "undefReaderMacro");
-                case MetaExp("bof", stringsExp):
-                    table = k.startOfFileReadTable;
-                    stringsThatMatch(stringsExp, "undefReaderMacro");
-                case MetaExp("eof", stringsExp):
-                    table = k.endOfFileReadTable;
-                    stringsThatMatch(stringsExp, "undefReaderMacro");
-                default:
-                    stringsThatMatch(exps[0], "undefReaderMacro");
-            };
-            for (s in strings) {
-                table.remove(s);
-            }
-            return null;
-        };
-        renameAndDeprecate("undefreadermacro", "undefReaderMacro");
-
-        // Having this floating out here is sketchy, but should work out fine because the variable is always re-set
-        // through the next function before being used in defalias or undefalias
-        var aliasMap:Map<String, ReaderExpDef> = null;
-
-        function getAliasName(k:KissState, nameExpWithMeta:ReaderExp, formName:String):String {
-            var error = KissError.fromExp(nameExpWithMeta, 'first argument to $formName should be &call [alias] or &ident [alias]');
-            var nameExp = switch (nameExpWithMeta.def) {
-                case MetaExp("call", nameExp):
-                    aliasMap = k.callAliases;
-                    nameExp;
-                case MetaExp("ident", nameExp):
-                    aliasMap = k.identAliases;
-                    nameExp;
-                default:
-                    throw error;
-            };
-            return switch (nameExp.def) {
-                case Symbol(whenItsThis):
-                    whenItsThis;
-                default:
-                    throw error;
-            };
-        }
-
-        k.doc("defalias", 2, 2, "(defAlias <<&call or &ident> whenItsThis> <makeItThis>)");
-        macros["defalias"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = getAliasName(k, exps[0], "defAlias");
-
-            aliasMap[name] = exps[1].def;
-            return null;
-        };
-        renameAndDeprecate("defalias", "defAlias");
-
-        k.doc("undefalias", 1, 1, "(undefAlias <<&call or &ident> alias>)");
-        macros["undefalias"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = getAliasName(k, exps[0], "undefAlias");
-
-            aliasMap.remove(name);
-            return null;
-        };
-        renameAndDeprecate("undefalias", "undefAlias");
-
-        // Macros that null-check and extract patterns from enums (inspired by Rust)
-        function ifLet(assertLet:Bool, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            var funcName = if (assertLet) "assertLet" else "ifLet";
-            var thenExpStr = if (assertLet) "<body...>" else "<thenExp>";
-            var elseExpStr = if (assertLet) "" else " <?elseExp>";
-            var maxArgs = if (assertLet) null else 3;
-            k.doc(funcName, 2, maxArgs, '($funcName [<enum bindings...>] ${thenExpStr}${elseExpStr})');
-            var b = wholeExp.expBuilder();
-
-            var bindingList = exps[0].bindingList(funcName);
-            var firstPattern = bindingList.shift();
-            var firstValue = bindingList.shift();
-
-            var thenExp = if (assertLet) b.begin(exps.slice(1)) else exps[1];
-            var elseExp = if (!assertLet && exps.length > 2) {
-                exps[2];
-            } else if (assertLet) {
-                b.callSymbol("throw", [b.str('Assertion binding ${firstValue.def.toString()} -> ${firstPattern.def.toString()} failed')]);
-            } else {
-                b.symbol("null");
-            };
-
-            var gensym = b.symbol();
-            return b.let(
-                [gensym, firstValue],
-                [b.callSymbol("if", [
-                    gensym,
-                    b.callSymbol("case", [
-                        gensym,
-                        b.call(firstPattern, [
-                                if (bindingList.length == 0) {
-                                    thenExp;
-                                } else {
-                                    ifLet(assertLet, wholeExp, [
-                                        b.list(bindingList)
-                                    ].concat(exps.slice(1)), k);
-                                }
-                            ]),
-                        b.callSymbol("otherwise", [
-                            elseExp
-                        ])
-                    ]),
-                    elseExp
-                ])]);
-        }
-        macros["ifLet"] = ifLet.bind(false);
-
-        k.doc('whenLet', 2, null, "(whenLet [<enum bindings...>] <body...>)");
-        macros["whenLet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.callSymbol("ifLet", [
-                exps[0],
-                b.begin(exps.slice(1)),
-                b.symbol("null")
-            ]);
-        };
-
-        k.doc("unlessLet", 2, null, "(unlessLet [<enum bindings...>] <body...>)");
-        macros["unlessLet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.callSymbol("ifLet", [
-                exps[0],
-                b.symbol("null"),
-                b.begin(exps.slice(1))
-            ]);
-        };
-
-        macros["assertLet"] = ifLet.bind(true);
-
-        k.doc("awaitLet", 2, null, "(awaitLet [<promise bindings...>] <?catchHandler> <body...>)");
-        function awaitLet(rejectionHandler:ReaderExp, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            var bindingList = exps[0].bindingList("awaitLet");
-
-            var firstName = bindingList.shift();
-            var firstValue = bindingList.shift();
-            var b = wholeExp.expBuilder();
-
-            var rejectionHandlerArgsAndBody = [];
-            if (rejectionHandler == null) {
-                function error(firstName:ReaderExp) {
-                    return b.callSymbol("+", [b.str('awaitLet ${firstName.symbolNameValue()} rejected promise: '), b.symbol("reason")]);
-                }
-                rejectionHandler = b.symbol();    
-                rejectionHandlerArgsAndBody = switch (exps[1].def) {
-                    case CallExp({pos: _, def: Symbol("catch")}, catchArgs):
-                        exps.splice(1,1);
-                        catchArgs;
-                    default:
-                        [b.list([b.symbol("reason")])].concat([
-                            b.callSymbol("#when", [
-                                b.symbol("vscode"),
-                                b.callSymbol("Vscode.window.showErrorMessage", [error(firstName)]),
-                            ]),
-                            // If running VSCode js, this throw will be a no-op but it makes the expression type-unify:
-                            b.callSymbol("throw", [
-                                error(firstName)
-                            ])
-                        ]);
-                }
-            }
-
-            var innerExp = if (bindingList.length == 0) {
-                b.begin(exps.slice(1));
-            } else {
-                awaitLet(rejectionHandler, wholeExp, [b.list(bindingList)].concat(exps.slice(1)), k);
-            };
-            switch(firstName.def) {
-                case MetaExp("sync", firstName):
-                    return b.let([firstName, firstValue], [innerExp]);
-                case MetaExp(other, _):
-                    throw KissError.fromExp(firstName, 'bad meta annotation &$other');
-                default:
-            }
-
-            var exp = b.call(b.field("then", firstValue), [
-                b.callSymbol("lambda", [
-                    b.list([firstName]),
-                    innerExp
-                ]),
-                rejectionHandler
-            ]);
-            
-            if (rejectionHandlerArgsAndBody.length > 0) {
-                exp = b.callSymbol("withFunctions", [
-                    b.list([b.call(b.typed("Dynamic", rejectionHandler),
-                                rejectionHandlerArgsAndBody)]),
-                    exp
-                ]);
-            }
-
-            return exp;
-        }
-       
-        macros["awaitLet"] = awaitLet.bind(null);
-        
-        k.doc("whileLet", 2, null, "(whileLet [<bindings...>] <body...>)");
-        macros["whileLet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            return b.callSymbol("loop", [
-                b.callSymbol("ifLet", [
-                    exps[0],
-                        b.begin(exps.slice(1)),
-                    b.callSymbol("break", [])
-                ])
-            ]);
-        };
-
-        k.doc("withTempSet", 2, null, "(withTempSet [<bindings...>] <body...>)");
-        macros["withTempSet"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var bindingList = exps[0].bindingList("withTempSet");
-            var body = exps.slice(1);
-            var bindingPairs = Prelude.groups(bindingList, 2);
-            var exps = [for (pair in bindingPairs) pair[0]];
-            var values = [for (pair in bindingPairs) pair[1]];
-            var oldValueSymbols = [for (i in 0...bindingPairs.length) b.symbol()];
-            var letBindings = Lambda.flatten(Prelude.zipThrow(oldValueSymbols, exps));
-            var setBindings:Array<Array<ReaderExp>> = Prelude.zipThrow(exps, values);
-            var resetBindings:Array<Array<ReaderExp>> = Prelude.zipThrow(exps, oldValueSymbols);
-            var result = b.symbol();
-            b.let(letBindings, [
-                for (pair in setBindings)
-                    b.set(pair[0], pair[1])
-            ].concat([
-                b.let([result, b.begin(body)], [
-                    for (pair in resetBindings)
-                        b.set(pair[0], pair[1])
-                ].concat([result]))
-            ]));
-        };
-
-        k.doc("defnew", 1, null, "(defNew [<args...>] [<optional property bindings...>] <optional body...>");
-        macros["defnew"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var args = exps.shift();
-            var bindingList = [];
-
-            if (exps.length != 0) {
-                switch (exps[0].def) {
-                    case ListExp(_):
-                        bindingList = exps.shift().bindingList("defNew", true);
-                    default:
-                }
-            }
-            var bindingPairs = Prelude.groups(bindingList, 2);
-
-            var propertyDefs = [for (bindingPair in bindingPairs) {
-                var b = bindingPair[0].expBuilder();
-                b.call(b.symbol("prop"), [bindingPair[0]]);
-            }];
-            var propertySetExps = [for (bindingPair in bindingPairs) {
-                var b = bindingPair[1].expBuilder();
-                b.call(b.symbol("set"), [b.symbol(Helpers.varName("a prop property binding", bindingPair[0])), bindingPair[1]]);
-            }];
-
-            var firstExps = [];
-            // &first (super <...>) ensures super is called before anything else (for extending native classes).
-            // You can put more than one expression &first but they all have to come before non-first expressions (for readability)
-            while (exps.length > 0) {
-                switch (exps[0].def) {
-                    case MetaExp("first", exp):
-                        exps.shift();
-                        firstExps.push(exp);
-                    default:
-                        break;
-                }
-            }
-
-            var argList = [];
-            // &prop in the argument list defines a property supplied directly as an argument
-            for (arg in Helpers.argList(args, "defNew")) {
-                var b = arg.expBuilder();
-                switch (arg.def) {
-                    case MetaExp("prop", propExp):
-                        // TODO allow the reverse order (&mut &prop)
-                        var propDeclExp = propExp;
-                        switch (propExp.def) {
-                            case MetaExp("mut", innerExp):
-                                propExp = innerExp;
-                            default:
-                        }
-                        argList.push(propExp);
-                        propertyDefs.push(
-                            b.call(b.symbol("prop"), [propDeclExp]));
-                        switch (propExp.def) {
-                            case TypedExp(_, {pos: _, def: Symbol(name)}):
-                                propertySetExps.push(
-                                    b.call(b.symbol("set"), [b.field(name, b.symbol("this")), b.symbol(name)]));
-                            case Symbol(name):
-                                throw KissError.fromExp(arg, '&prop constructor argument $name must be typed');
-                            default:
-                                throw KissError.fromExp(arg, "invalid use of &prop in defNew");
-                        }
-                    default:
-                        argList.push(arg);
-                }
-            }
-
-            var b = wholeExp.expBuilder();
-
-            return b.begin(propertyDefs.concat([
-                b.call(b.symbol("method"), [
-                    b.symbol("new"),
-                    b.list(argList)
-                ].concat(firstExps).concat(propertySetExps).concat(exps))
-            ]));
-        };
-        renameAndDeprecate("defnew", "defNew");
-
-        k.doc("collect", 1, 1, "(collect <iterator or iterable>)");
-        macros["collect"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            b.call(b.symbol("for"), [b.symbol("elem"), exps[0], b.symbol("elem")]);
-        };
-
-        function once(macroName:String, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            k.doc(macroName, 1, null, '($macroName <body...>)');
-            var b = wholeExp.expBuilder();
-            var flag = b.symbol();
-            // define the field:
-            k.convert(b.call(b.symbol(macroName), [b.meta("mut", flag), b.symbol("true")]));
-            return b.call(b.symbol("when"), [flag, b.call(b.symbol("set"), [flag, b.symbol("false")])].concat(exps));
-        }
-
-        macros["once"] = once.bind("var");
-        macros["oncePerInstance"] = once.bind("prop");
-
-        k.doc("defMacroVar", 2, 2, "(defMacroVar <name> <value>)");
-        macros["defMacroVar"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = exps[0].symbolNameValue();
-
-            k.macroVars[name] = Helpers.runAtCompileTimeDynamic(exps[1], k);
-
-            return null;
-        };
-
-        k.doc("setMacroVar",2, 2, "(setMacroVar <name> <value>)");
-        macros["setMacroVar"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var name = exps[0].symbolName().withPosOf(exps[0]);
-            var b = wholeExp.expBuilder();
-            
-            return b.callSymbol("_setMacroVar", [name, exps[1]]);
-        };
-
-        k.doc("defMacroFunction", 3, null, "(defMacroFunction <name> [<args>] <body...>)");
-        macros["defMacroFunction"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            k.stateChanged = true;
-            var b = wholeExp.expBuilder();
-            var name = exps[0].symbolNameValue();
-            var lambdaExp = b.callSymbol("lambda", [exps[1]].concat(exps.slice(2)));
-
-            // It's absurd, but each time hscript evaluates the lambda expression it captures another layer of recursion:
-            for (_ in 0...MACRO_RECURSION_LIMIT) {
-                k.macroVars[name] = Helpers.runAtCompileTimeDynamic(lambdaExp, k);
-            }
-            return null;
-        };
-
-        // Replace "try" with this in a try-catch statement to let all exceptions throw
-        // their original call stacks. This is more convenient for debugging than trying to
-        // comment out the "try" and its catches, and re-balance parens
-        k.doc("letThrow", 1, null, "(letThrow <thing> <catches...>)");
-        macros["letThrow"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            exps[0];
-        };
-
-        k.doc("objectWith", 1, null, "(objectWith <?[<bindings...>]> <fieldNames...>)");
-        macros["objectWith"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var objectExps = try {
-                var l = Helpers.bindingList(exps[0], "field bindings for objectWith", true);
-                exps.shift();
-                l;
-            } catch (_notABindingList) {
-                [];
-            }
-
-            for (exp in exps) {
-                switch (exp.def) {
-                    case Symbol(_):
-                        objectExps.push(exp);
-                        objectExps.push(exp);
-                    default:
-                        throw KissError.fromExp(exp, "invalid expression in (objectWith)");
-                }
-            }
-
-            var b = wholeExp.expBuilder();
-            b.callSymbol("object", objectExps);
-        }
-
-        // Macro for triggering collection of expressions throughout a Kiss file, to inject them later with collectedBlocks
-        k.doc("collectBlocks", 1, 2, "(collectBlocks <block symbol> <?expression to inline instead of the blocks>)");
-        macros["collectBlocks"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var blockName = try {
-                exps[0].symbolNameValue();
-            } catch (notSymbolError:String) {
-                throw KissError.fromExp(wholeExp, notSymbolError);
-            }
-            k.collectedBlocks[blockName] = [];
-            // TODO some assertion that the coder hasn't defined over another macro (also should apply to defMacro)
-            macros[blockName] = (wholeExp:ReaderExp, innerExps:Array<ReaderExp>, k:KissState) -> {
-                k.collectedBlocks[blockName] = k.collectedBlocks[blockName].concat(innerExps);
-                if (exps.length > 1) exps[1] else null;
-            };
-            null;
-        };
-
-        k.doc("collectedBlocks", 1, 1, "(collectedBlocks <block symbol>)");
-        macros["collectedBlocks"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var blockName = try {
-                exps[0].symbolNameValue();
-            } catch (notSymbolError:String) {
-                throw KissError.fromExp(wholeExp, notSymbolError);
-            }
-            var b = wholeExp.expBuilder();
-            if (!k.collectedBlocks.exists(blockName)) {
-                throw KissError.fromExp(wholeExp, 'no blocks for $blockName were collected. Try adding (collectBlocks ${blockName}) at the start of the file.');
-            }
-            b.begin(k.collectedBlocks[blockName]);
-        };
-
-        // These are implemented as variadic functions, so checkNumArgs() is never actually called,
-        // but the docs might be useful
-        k.doc("min", 2, null, "(min <v1> <v2> <more values...>)");
-        k.doc("max", 2, null, "(max <v1> <v2> <more values...>)");
-
-        k.doc("setMin", 2, null, "(setMin <var> <v2> <more values...>)");
-        k.doc("setMax", 2, null, "(setMax <var> <v2> <more values...>)");
-        function setCompMacro(compType:String) {
-            return (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-                var b = wholeExp.expBuilder();
-                b.set(exps[0], b.callSymbol(compType, exps));
-            }
-        }
-        macros["setMin"] = setCompMacro("min");
-        macros["setMax"] = setCompMacro("max");
-
-        k.doc("clamp", 2, 3, "(clamp <expr> <min or null> <?max or null>)");
-        macros["clamp"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var maxExp = if (exps.length == 3) exps.pop() else b.symbol("null");
-            var expToSet = exps.shift();
-            var minExp = exps.shift();
-            var min = b.symbol("minVal");
-            var max = b.symbol("maxVal");
-            b.callSymbol("let", [
-                b.list([
-                    min, minExp,
-                    max, maxExp
-                ]),
-                b.callSymbol("when", [
-                    min,
-                    b.callSymbol("set", [expToSet, b.callSymbol("max", [min, expToSet])])
-                ]),
-                b.callSymbol("when", [
-                    max,
-                    b.callSymbol("set", [expToSet, b.callSymbol("min", [max, expToSet])])
-                ]),
-                expToSet
-            ]);
-        };
-
-        // The wildest code in Kiss to date
-        // TODO test exprCase!!
-        k.doc("exprCase", 2, null, "(exprCase <expr> <pattern callExps...>)");
-        macros["exprCase"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var toMatch = exps.shift();
-            var b = wholeExp.expBuilder();
-            var functionKey = Uuid.v4();
-
-            exprCaseFunctions[functionKey] = (toMatchValue:ReaderExp) -> {
-                for (patternExp in exps) {
-                    switch (patternExp.def) {
-                        case CallExp(pattern, body):
-                            if (matchExpr(pattern, toMatchValue)) {
-                                return b.begin(body);
-                            }
-                        default:
-                            throw KissError.fromExp(patternExp, "bad exprCase pattern expression");
-                    }
-                }
-
-                throw KissError.fromExp(wholeExp, 'expression ${toMatchValue.def.toString()} matches no pattern in exprCase');
-            };
-
-            return b.call(b.symbol("Macros.exprCase"), [b.str(functionKey), toMatch, b.symbol("__interp__")]);
-        };
-
-        // Maybe the NEW wildest code in Kiss?
-        k.doc("#extern", 4, null, "(#extern <BodyType> <lang> <?compileArgs object> [<typed bindings...>] <body...>)");
-        macros["#extern"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            // Skip all extern code generation if -D no-extern is provided to the compiler
-            if (Context.defined("no-extern")) {
-                return b.callSymbol("throw", [b.str("tried to call #extern code when -D no-extern was provided during compilation")]);
-            }
-
-            var bodyType = exps.shift();
-            var langExp = exps.shift();
-            var originalLang = langExp.symbolNameValue();
-            // make the lang argument forgiving, because many will assume it can match the compiler defines and command-line arguments of Haxe
-            var lang = switch (originalLang) {
-                case "python" | "py": "Python";
-                case "js" | "javascript": "JavaScript";
-                default: originalLang;
-            };
-
-            var allowedLangs = EnumTools.getConstructors(CompileLang);
-            if (allowedLangs.indexOf(lang) == -1) {
-                throw KissError.fromExp(langExp, 'unsupported lang for #extern: $originalLang should be one of $allowedLangs');
-            }
-            var langArg = EnumTools.createByName(CompileLang, lang);
-
-            var compileArgsExp = null;
-            var bindingListExp = null;
-            var nextArg = exps.shift();
-            switch (nextArg.def) {
-                case CallExp({pos: _, def: Symbol("object")}, _):
-                    compileArgsExp = nextArg;
-                    nextArg = exps.shift();
-                case ListExp(_):
-                // Let the next switch handle the binding list
-                default:
-                    throw KissError.fromExp(nextArg, "second argument to #extern can either be a CompileArgs object or a list of typed bindings");
-            }
-            switch (nextArg.def) {
-                case ListExp(_):
-                    bindingListExp = nextArg;
-                default:
-                    throw KissError.fromExp(nextArg, "#extern requires a list of typed bindings");
-            }
-
-            var compileArgs:CompilationArgs = if (compileArgsExp != null) {
-                Helpers.runAtCompileTimeDynamic(compileArgsExp, k);
-            } else {
-                {};
-            }
-
-            var bindingList = bindingListExp.bindingList("#extern", true);
-
-            var idx = 0;
-            var stringifyExpList = [];
-            var parseBindingList = [];
-            while (idx < bindingList.length) {
-                var type = "";
-                var untypedName = switch (bindingList[idx].def) {
-                    case TypedExp(_type, symbol = {pos: _, def: Symbol(name)}):
-                        type = _type;
-                        symbol;
-                    default: throw KissError.fromExp(bindingList[idx], "name in #extern binding list must be a typed symbol");
-                };
-                switch (bindingList[idx + 1].def) {
-                    // _ in the value position of the #extern binding list will reuse the name as the value
-                    case Symbol("_"):
-                        bindingList[idx + 1] = untypedName;
-                    default:
-                }
-
-                stringifyExpList.push(b.the(b.symbol("String"), b.callSymbol("tink.Json.stringify", [b.the(b.symbol(type), bindingList[idx + 1])])));
-                parseBindingList.push(bindingList[idx]);
-                // This will be called in the context where __args__ is Sys.args()
-                parseBindingList.push(b.callSymbol("tink.Json.parse", [b.callField("shift", b.symbol("__args__"), [])]));
-                idx += 2;
-            }
-
-            var externExps = [
-                b.let([b.symbol("__args__"), b.callSymbol("Sys.args", [])], [
-                    b.callSymbol("set", [
-                        b.symbol("Prelude.printStr"),
-                        b.symbol("Prelude._externPrintStr")
-                    ]),
-                    b.callSymbol("Prelude._printStr", [
-                        b.callSymbol("tink.Json.stringify", [
-                            b.the(bodyType, if (bindingList.length > 0) {
-                                b.let(parseBindingList, exps);
-                            } else {
-                                b.begin(exps);
-                            })
-                        ])
-                    ]),
-                    b.callSymbol("Sys.exit", [b.symbol("0")])
-                ])
-            ];
-            b.the(
-                bodyType,
-                b.callSymbol("tink.Json.parse", [
-                    b.call(b.raw(CompilerTools.compileToScript(externExps, langArg, compileArgs, wholeExp).toString()), [b.list(stringifyExpList)])
-                ]));
-        };
-
-        k.doc("countingLambda", 3, null, "(countingLambda <countVar> [<argsNames...>] <body...>)");
-        macros["countingLambda"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            var countVarSymbol = exps[0];
-            var args = exps[1];
-            var body = exps.slice(2);
-
-            return b.let([
-                b.meta("mut", countVarSymbol), b.int(0)
-            ], [b.callSymbol("lambda", [
-                args,
-                b.callSymbol("+=", [
-                    countVarSymbol,
-                    b.int(1)
-                ])
-            ].concat(body))]);
-        };
-
-        k.doc("onceLambda", 3, null, "(onceLambda [<argsNames...>] <body...>)");
-        macros["onceLambda"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            var args = exps[0];
-            var body = exps.slice(1);
-            var flagSymbol = b.symbol();
-
-            return b.let([
-                b.meta("mut", flagSymbol), b.symbol("false")
-            ], [b.callSymbol("lambda", [
-                args,
-                b.callSymbol("unless", [
-                    flagSymbol,
-                    b.set(flagSymbol, b.symbol("true"))
-                ].concat(body))
-            ])]);
-        };
-
-        // Time a block's evaluation
-        k.doc("measureTime",1, null, "(measureTime <body...>)");
-        macros["measureTime"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            return b.callSymbol("haxe.Timer.measure", [b.callSymbol("lambda", [b.list([])].concat(exps))]);
-        };
-
-        // TODO should indexOf and lastIndexOf accept negative starting indices?
-        function indexOfMacro(last:Bool, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            var funcName = if (last) "lastIndexOf" else "indexOf";
-            k.doc(funcName, 2, 3, '($funcName <list or string> <element or substring> <?startingIndex>)');
-            var b = wholeExp.expBuilder();
-            var cases = [
-                b.callField(funcName, exps.shift(), exps),
-                b.callSymbol("-1", [b.symbol("haxe.ds.Option.None")]),
-                b.callSymbol("other", [b.callSymbol("haxe.ds.Option.Some", [b.symbol("other")])]),
-                b.callSymbol("null", [b.callSymbol("throw", [b.str("Haxe indexOf is broken")])])
-            ];
-            return b.callSymbol("case", cases);
-        }
-        macros["indexOf"] = indexOfMacro.bind(false);
-        macros["lastIndexOf"] = indexOfMacro.bind(true);
-
-        // contains is a macro so it can be called on either an Array or a String
-        k.doc("contains", 2, 2, '(contains <string or list> <snippet or element>)');
-        macros["contains"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            return b.not(b.callSymbol("=", [b.symbol("-1"), b.callField("indexOf", exps[0], [exps[1]])]));
-        }
-
-        // Under the hood, quoted expressions are just Kiss strings for a KissInterp
-        k.doc("quote", 1, 1, '(quote <exp>)');
-        macros["quote"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            return b.str(Reader.toString(exps[0].def));
-        };
-
-        // Under the hood, (eval) uses Type.getClassFields, Type.getInstanceFields, and Reflect.field, to mishmash
-        // a bunch of fields ONLY from (var) and (prop) in the class that called Kiss.build(), AT RUNTIME, into a KissInterp that evaluates a string of Kiss code.
-        // This is all complicated, and language- and platform-dependent. And slow, because it converts Kiss to HScript at runtime.
-        // When (eval) is used in a static function, it cannot access instance variables.
-        // (eval) should not be used for serious purposes.
-        k.doc("eval", 1, 1, '(eval <exp>)');
-        macros["eval"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var className = Context.getLocalClass().toString();
-            var classSymbol = b.symbol(className);
-
-            // TODO this might be reusable for passing things to #extern
-            
-            var classFieldsSymbol = b.symbol();
-            var instanceFieldsSymbol = b.symbol();
-            var interpSymbol = b.symbol();
-            var bindings = [
-                interpSymbol, b.callSymbol("new", [b.symbol("kiss.KissInterp")]),
-                classFieldsSymbol, b.callSymbol("Type.getClassFields", [classSymbol]),
-            ];
-            if (!k.inStaticFunction) {
-                bindings = bindings.concat([instanceFieldsSymbol, b.callSymbol("Type.getInstanceFields", [classSymbol])]);
-            }
-            var body = [
-                b.callSymbol("doFor", [
-                    b.symbol("staticField"), classFieldsSymbol,
-                    b.callField("set", b.field("variables", interpSymbol), [
-                        b.symbol("staticField"), b.callSymbol("Reflect.field", [classSymbol, b.symbol("staticField")])
-                    ])
-                ])
-            ];
-            if (!k.inStaticFunction) {
-                body.push(
-                    b.callSymbol("doFor", [
-                        b.symbol("instanceField"), instanceFieldsSymbol,
-                        b.callField("set", b.field("variables", interpSymbol), [
-                            b.symbol("instanceField"), b.callSymbol("Reflect.field", [b.symbol("this"), b.symbol("instanceField")])
-                        ])
-                    ])
-                );
-            }
-            body.push(b.callField("evalKiss", interpSymbol, [exps[0]]));
-            b.let(bindings, body);
-        };
-
-        function typedCallMacro(name:String, symbol:String, type:String) {
-            macros[name] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-                k.doc(name, 2, null, '($name <lists...>)');
-                var b = wholeExp.expBuilder();
-                b.callSymbol("the", [b.symbol(type), b.callSymbol('Prelude.$symbol', exps)]);
-            };
-        }
-        typedCallMacro("zip", "zipThrow", "Array<Array<Dynamic>>");
-        typedCallMacro("zipKeep", "zipKeep", "Array<Array<Dynamic>>");
-        typedCallMacro("zipDrop", "zipDrop", "Array<Array<Dynamic>>");
-        typedCallMacro("zipThrow", "zipThrow", "Array<Array<Dynamic>>");
-        typedCallMacro("intersect", "intersect", "Array<Array<Dynamic>>");
-        typedCallMacro("concat", "concat", "Array<Dynamic>");
-
-        k.doc("withEvalOnce", 2, null, "(withEvalOnce [<symbols...>] <body...>)");
-        macros["withEvalOnce"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var symbols = exps[0].argList("withEvalOnce");
-            var body = exps.slice(1);
-            var bindings = [];
-            for (symbol in symbols) {
-                bindings.push(symbol);
-                bindings.push(Unquote(symbol).withPosOf(symbol));
-            }
-            return Quasiquote(b.let(bindings, body)).withPosOf(wholeExp);
-        };
-
-        function printAll (locals:Bool, nullCheck:Bool, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            k.printFieldsCalls.push(wholeExp);
-            k.localVarWarning();
-            var b = wholeExp.expBuilder();
-            var list = if (locals) k.localVarsInScope else k.varsInScope;
-            if (!locals && k.inStaticFunction) {
-                list = [for (idx in 0...list.length) if (!k.varsInScopeAreStatic[idx]) continue; else list[idx]];
-            }
-            return b.begin([for (v in list) {
-                var symbol = b.symbol(v.name);
-                var pr = b.callSymbol("print", [symbol, b.str(v.name)]);
-                if (nullCheck) {
-                    pr = b.callSymbol("unless", [symbol, pr]);
-                }
-                pr;
-            }]);
-        }
-        k.doc("printAll", 0, 0, "(printAll)");
-        macros["printAll"] = printAll.bind(false, false);
-        k.doc("printLocals", 0, 0, "(printLocals)");
-        macros["printLocals"] = printAll.bind(true, false);
-        k.doc("printAllNulls", 0, 0, "(printAllNulls)");
-        macros["printAllNulls"] = printAll.bind(false, true);
-        k.doc("printLocalNulls", 0, 0, "(printLocalNulls)");
-        macros["printLocalNulls"] = printAll.bind(true, true);
-        
-        var savedVarFilename = null;
-        k.doc("savedVarFile", 1, 1, '(savedVarFilename "<path>")');
-        macros["savedVarFile"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            savedVarFilename = compileTimeResolveToString("The only argument to (savedVarFile...)", "a json filename", exps[0], k);
-            null;
-        };
-        
-        k.doc("savedVar", 2, 2, "(savedVar <:Type> <name> <initial value>)");
-        macros["savedVar"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var name = exps[0];
-            var nameString = Prelude.symbolNameValue(name, true, false);
-            var type = Helpers.explicitTypeString(name);
-            var initialValue = exps[1];
-            var filename = if (savedVarFilename != null) {
-                if (!savedVarFilename.endsWith(".json"))
-                    savedVarFilename = '${savedVarFilename}.json';
-                b.str(savedVarFilename);
-            } else {
-                b.str("." + k.className + ".json");
-            };
-        
-            function ifLetFileJson(thenBlock:Array<ReaderExp>, elseBlock:Array<ReaderExp>) {
-                return b.callSymbol("if", [
-                    b.callSymbol("and", [
-                        b.callSymbol("sys.FileSystem.exists", [filename]),
-                        b.not(b.callSymbol("sys.FileSystem.isDirectory", [filename]))
-                    ]),
-                    // then
-                    b.let([
-                        b.symbol("content"), b.callSymbol("sys.io.File.getContent", [filename]),
-                        b.typed("haxe.DynamicAccess<String>", b.symbol("json")), b.callSymbol("haxe.Json.parse", [b.symbol("content")])
-                    ], thenBlock),
-                    // else
-                    b.begin(elseBlock)
-                ]);
-            }
-        
-            var setAndSave = [
-                b.callSymbol("dictSet", [b.symbol("json"), b.str(nameString), b.raw("tink.Json.stringify(v)")]),
-                b.callSymbol("sys.io.File.saveContent", [filename, b.raw("haxe.Json.stringify(json)")]),
-                b.raw("v;")
-            ];
-        
-            b.begin([
-                b.callSymbol("var", [name, b.callSymbol("property", [b.symbol("get"), b.symbol("set")])]),
-                b.callSymbol(
-                    "function", [
-                        b.typed(type, b.symbol('get_${nameString}')), 
-                        b.list([]), 
-                        ifLetFileJson([
-                            b.callSymbol("if", [
-                                b.callSymbol("json.exists", [b.str(nameString)]),
-                                b.raw("{ var v:" + type + " = tink.Json.parse(json['" + nameString + "']); v;}"),
-                                initialValue
-                            ])
-                        ], 
-                        [
-                            initialValue
-                        ])
-                    ]),
-                b.callSymbol(
-                    "function", [
-                        b.typed(type, b.symbol('set_${nameString}')), 
-                        b.list([b.typed(type, b.symbol("v"))]), 
-                        ifLetFileJson(
-                            setAndSave,
-                            [
-                                b.let([b.typed("haxe.DynamicAccess<String>", b.symbol("json")), b.raw("haxe.Json.parse('{}')")], setAndSave)
-                            ])
-                    ])
-            ]);
-        };
-
-        k.doc("withMutProperties", 2, null, "(withMutProperties [<vars...>] <body...>)");
-        // Because properties like the ones created with savedVar won't automatically invoke their set() behavior when setNth, dictSet, or methods modify their object's data,
-        // this macro exists to help you enforce that the set() behavior will be invoked. Also enforces that get() is only called once and the returned reference persists changes.
-        macros["withMutProperties"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            // TODO the nomenclature in the implementation is misleading. This macro is not just useful for savedVar properties.
-            var savedVarList = Helpers.argList(exps[0], "withMutProperties");
-            var uuids = [for (savedVar in savedVarList) {
-                switch (savedVar.def) {
-                    case Symbol(_):
-                    default:
-                        throw KissError.fromExp(savedVar, "withMutProperties requires its initial arguments to be plain symbols of property names");
-                }
-                b.symbol();
-            }];
-
-            var body = exps.slice(1);
-            b.let(Lambda.flatten(Prelude.zipThrow(uuids, savedVarList)), [
-                b.let(Lambda.flatten(Prelude.zipThrow(savedVarList, uuids)), body),
-            ].concat([for (savedVar in savedVarList) b.set(savedVar, uuids.shift())]));
-        };
-
-        k.doc("withFunctions", 2, null, "(withFunctions [(<funcName1> [<args...>] <body...>) <more functions...>] <body...>)");
-        macros["withFunctions"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            var funcList = Helpers.argList(args[0], "withFunctions");
-            if (funcList.length == 0) throw KissError.fromExp(args[0], "withFunctions requires at least one function definition");
-            var localFunctions = [];
-            do {
-                var funcExp = funcList.shift();
-                switch (funcExp.def) {
-                    case CallExp(nameExp, argsAndBody) if (argsAndBody.length >= 2):
-                        localFunctions.push(b.callSymbol("localFunction", [
-                            nameExp, argsAndBody.shift()
-                        ].concat(argsAndBody)));
-                    default:
-                        throw KissError.fromExp(funcExp, "withFunctions function definition should follow this form: (<funcName> [<args...>] <body...>)");
-                }
-                
-            } while (funcList.length > 0);
-
-            var exp = b.begin(localFunctions.concat(args.slice(1)));
-            // Prelude.print(Reader.toString(exp.def));
-            exp;
-        };
-        
-        k.doc("typeCase", 2, null, "(typeCase [<values>] ([:<Type> <name> <more typed names...>] <body>) <more cases...> (otherwise <required default>))");
-        macros["typeCase"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-
-            var argsListExp = args.shift();
-            var argsList = Helpers.argList(argsListExp, "typeCase", false);
-
-            var cases:kiss.List<ReaderExp> = [for (c in args) {
-                c.expBuilder().neverCase();
-            }];
-
-            Helpers.checkNoEarlyOtherwise(cases);
-
-            var symbols = [for (i in 0...argsList.length) b.symbol()];
-            var dynamicSymbols = [for (s in symbols) b.typed("Dynamic", s)];
-            var outerLetBindings = [];
-            for (i in 0...argsList.length) {
-                outerLetBindings.push(dynamicSymbols[i]);
-                outerLetBindings.push(argsList[i]);
-            }
-
-            cases = [for (c in cases) {
-                var b = c.expBuilder();
-                switch (c.def) {
-                    case CallExp({pos:_, def:ListExp(typedNames)}, body):
-                        var names = [];
-                        var types = [];
-                        var typesWithoutGenerics = [];
-                        for (exp in typedNames) {
-                            switch (exp.def) {
-                                case TypedExp(type, nameSymbol):
-                                    names.push(nameSymbol);
-                                    types.push(type);
-                                    if (type.contains("<")) {
-                                        type = type.substr(0, type.indexOf("<"));
-                                    }
-                                    typesWithoutGenerics.push(type);
-                                default:
-                                    throw KissError.fromExp(c, "bad typeCase case");
-                            }
-                        }
-                        var letBindings = [];
-                        for (i in 0...names.length) {
-                            letBindings.push(typedNames[i]);
-                            letBindings.push(names[i]);
-                        }
-                        b.call(b.callSymbol("when", [b.callSymbol("and", [
-                            for (i in 0...names.length) {
-                                b.callSymbol("Std.isOfType", [names[i], b.symbol(typesWithoutGenerics[i])]);
-                            }
-                        ]), b.list(names)]), [b.let(letBindings, body)]);
-                    default: c;
-                }
-            }];
-            
-            b.let(outerLetBindings, [
-                b.callSymbol("case", [b.list(symbols)].concat(cases))
-            ]);
-        }
-        
-        return macros;
-    }
-
-    static var exprCaseFunctions:Map<String, ReaderExp->ReaderExp> = [];
-
-    public static function exprCase(id:String, toMatchValue:ReaderExp, i:KissInterp):ReaderExp {
-        return i.variables["eval"](exprCaseFunctions[id](toMatchValue));
-    }
-
-    static function matchExpr(pattern:ReaderExp, instance:ReaderExp):Bool {
-        switch (pattern.def) {
-            case Symbol("_"):
-                return true;
-            case CallExp({pos: _, def: Symbol("exprOr")}, altPatterns):
-                for (altPattern in altPatterns) {
-                    if (matchExpr(altPattern, instance))
-                        return true;
-                }
-                return false;
-            case Symbol(patternSymbol):
-                return switch (instance.def) {
-                    case Symbol(instanceSymbol) if (patternSymbol == instanceSymbol):
-                        true;
-                    default:
-                        false;
-                };
-            case CallExp({pos: _, def: Symbol("exprTyped")}, [type, patternExp]):
-                var patternTypePath = Prelude.symbolNameValue(type);
-                return switch (instance.def) {
-                    case TypedExp(typePath, instanceExp) if (typePath == patternTypePath):
-                        matchExpr(patternExp, instanceExp);  
-                    default:
-                        false;
-                };
-            case ListExp(patternExps):
-                switch (instance.def) {
-                    case ListExp(instanceExps) if (patternExps.length == instanceExps.length):
-                        for (idx in 0...patternExps.length) {
-                            if (!matchExpr(patternExps[idx], instanceExps[idx]))
-                                return false;
-                        }
-                        return true;
-                    default:
-                        return false;
-                }
-            case CallExp(patternFuncExp, patternExps):
-                switch (instance.def) {
-                    case CallExp(instanceFuncExp, instanceExps) if (patternExps.length == instanceExps.length):
-                        if (!matchExpr(patternFuncExp, instanceFuncExp))
-                            return false;
-                        for (idx in 0...patternExps.length) {
-                            if (!matchExpr(patternExps[idx], instanceExps[idx]))
-                                return false;
-                        }
-                        return true;
-                    default:
-                        return false;
-                }
-            case MetaExp(metaStr, patternExp):
-                return switch (instance.def) {
-                    case MetaExp(instanceMetaStr, instanceExp) if (instanceMetaStr == metaStr):
-                        matchExpr(patternExp, instanceExp);
-                    default:
-                        false;
-                };
-            case StrExp(str):
-                return switch (instance.def) {
-                    case StrExp(instanceStr) if (instanceStr == str):
-                        true;
-                    default:
-                        false;
-                };
-            // I don't think I'll ever want to match specific  raw haxe, field expressions,
-            // key-value expressions, quasiquotes, unquotes, or UnquoteLists. This function can be expanded
-            // later if those features are ever needed.
-            default:
-                throw KissError.fromExp(pattern, "unsupported pattern for exprCase");
-        }
-    }
-
-    // cond expands telescopically into a nested if expression
-    static function addCond(k:KissState, macros:Map<String,MacroFunction>, formName:String, underlyingIf:String) {
-        k.doc(formName, 1, null, '($formName (<condition> <body...>) <more cases...>)');
-        function cond (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
-            var b = wholeExp.expBuilder();
-            return switch (exps[0].def) {
-                case CallExp(condition, body):
-                    b.call(b.symbol(underlyingIf), [
-                        condition,
-                        b.begin(body),
-                        if (exps.length > 1) {
-                            cond(b.callSymbol(formName, exps.slice(1)), exps.slice(1), k);
-                        } else {
-                            b.symbol("null");
-                        }
-                    ]);
-                default:
-                    throw KissError.fromExp(exps[0], 'top-level expression of ($formName... ) must be a call list starting with a condition expression');
-            };
-        }
-        macros[formName] = cond;
-    }
-}
diff --git a/kiss/src/kiss/Main.hx b/kiss/src/kiss/Main.hx
deleted file mode 100644
index 4aa780b3..00000000
--- a/kiss/src/kiss/Main.hx
+++ /dev/null
@@ -1,504 +0,0 @@
-package kiss;
-
-import sys.io.Process;
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import haxe.macro.Type;
-import kiss.Kiss;
-import kiss.Reader;
-import kiss.Stream;
-
-using tink.MacroApi;
-using kiss.Kiss;
-#end
-
-import haxe.Json;
-import haxe.io.Path;
-import sys.io.File;
-import sys.io.Process;
-import sys.FileSystem;
-
-using StringTools;
-
-class Main {
-    static function main() {
-        macroMain();
-    }
-
-    // When called from the command-line, Kiss has various subcommands, some of which can only run in macro context
-    static macro function macroMain():Expr {
-        var args = Sys.args();
-
-        switch (args.shift()) {
-            case "convert":
-                convert(args);
-            case "new-project":
-                newProject(args);
-            case "new-flixel-project":
-                newFlixelProject(args);
-            case "new-express-project":
-                newExpressProject(args);
-            case "new-vscode-project":
-                newVscodeProject(args);
-            case "new-firefox-project":
-                newFirefoxProject(args);
-            case "implement":
-                // kiss implement [type] [fromLib]
-                var _pwd = args.pop();
-                var theInterface = args.shift();
-                var pArgs = ["-D", "no-extern", "build-scripts/common-args.hxml", "-lib", "kiss"];
-                // pass --lib and the lib containing the interface as specified
-                if (args.length > 0) {
-                    pArgs = pArgs.concat(["-lib", args.shift()]);
-                }
-                pArgs = pArgs.concat(["--run", "kiss.Main", "_implement", theInterface]);
-                var p = new Process("haxe", pArgs);
-                var exitCode = p.exitCode(true);
-                Sys.print(p.stdout.readAll().toString());
-                Sys.print(p.stderr.readAll().toString());
-                Sys.exit(exitCode);
-            case "_implement":
-                implement(args[0]);
-            case other:
-                // TODO show a helpful list of subcommands
-                Sys.println('$other is not a kiss subcommand');
-                Sys.exit(1);
-        }
-
-        return macro null;
-    }
-
-    static function promptFor(what:String, ?defaultVal:String) {
-        var prompt = what;
-        if (defaultVal != null) {
-            if (defaultVal.length == 0) {
-                prompt += ' (default empty)';
-            } else {
-                prompt += ' (default $defaultVal)';
-            }
-        }
-        prompt += ": ";
-        Sys.print(prompt);
-        var input = Sys.stdin().readLine();
-        if (input.trim().length == 0) {
-            if (defaultVal != null) {
-                input = defaultVal;
-            } else {
-                Sys.println('value required for $what');
-                Sys.exit(1);
-            }
-        }
-        return input;
-    }
-
-    static function _makeFileForNewProject(templateDir:String, templateFile:Array<String>, workingDir:String, projectName:String, pkg:String) {
-        // Expand this list when making new templates with different binary extensions
-        var extensionsForBytes = [
-            "png"
-        ];
-        var replaceStringTemplate = true;
-        var getContent:haxe.Constraints.Function = File.getContent;
-        var saveContent:haxe.Constraints.Function = File.saveContent;
-        if (extensionsForBytes.indexOf(Path.extension(templateFile[templateFile.length - 1])) != -1) {
-            replaceStringTemplate = false;
-            getContent = File.getBytes;
-            saveContent = File.saveBytes;
-        }
-
-        var fullTemplateFilePath = Path.join([templateDir, "template"].concat(templateFile));
-        var newFileContent:Dynamic = getContent(fullTemplateFilePath);
-        if (replaceStringTemplate)
-            newFileContent = StringTools.replace(newFileContent, "template", pkg);
-        var templateFileInNewProject = [for (part in templateFile) if (part == "template") pkg else part];
-        var newFilePath = Path.join([workingDir, projectName].concat(templateFileInNewProject));
-        saveContent(newFilePath, newFileContent);
-    }
-
-    static function _makeFolderForNewProject(templateDir:String, templateFolder:Array<String>, workingDir:String, projectName:String, pkg:String) {
-        var fullTemplateFolderPath = Path.join([templateDir, "template"].concat(templateFolder));
-        var templateFolderInNewProject = [for (part in templateFolder) if (part == "template") pkg else part];
-        var newFolderPath = Path.join([workingDir, projectName].concat(templateFolderInNewProject));
-        FileSystem.createDirectory(newFolderPath);
-
-        for (fileOrFolder in FileSystem.readDirectory(fullTemplateFolderPath)) {
-            if (FileSystem.isDirectory(Path.join([fullTemplateFolderPath, fileOrFolder]))) {
-                _makeFolderForNewProject(templateDir, templateFolder.concat([fileOrFolder]), workingDir, projectName, pkg);
-            } else {
-                _makeFileForNewProject(templateDir, templateFolder.concat([fileOrFolder]), workingDir, projectName, pkg);
-            }
-        }
-    }
-
-    static function newProject(args:Array<String>) {
-        var kissLibPath = new Process("haxelib", ["libpath", "kiss"]).stdout.readAll().toString().trim();
-        var name = promptFor("name");
-        // TODO put the prompted name and description in a README.md
-        var pkg = name.toLowerCase().replace("-", "_");
-        var haxelibJson = {
-            "name": name,
-            "contributors": promptFor("authors (comma-separated)").split(",").map(StringTools.trim),
-            // TODO can make the default URL actually point to the projects subdirectory... but only want that functionality if the working dir is in kisslang/projects
-            "url": promptFor("url", "https://github.com/NQNStudios/kisslang"),
-            "license": promptFor("license", "LGPL"),
-            "tags": {
-                var t = promptFor("tags (comma-separated)", "").split(",").map(StringTools.trim);
-                t.remove("");
-                t;
-            },
-            "description": promptFor("description", ""),
-            "version": "0.0.0",
-            "releasenote": "",
-            "classPath": "src/",
-            "main": '${pkg}.Main',
-            "dependencies": {
-                "kiss": ""
-            }
-        };
-        var workingDir = Sys.args().pop();
-        var makeFileForNewProject:haxe.Constraints.Function = _makeFileForNewProject.bind(kissLibPath, _, workingDir, name, pkg);
-        FileSystem.createDirectory(Path.join([workingDir, name, "src", pkg]));
-        makeFileForNewProject(["src", "template", "Main.hx"]);
-        makeFileForNewProject(["src", "template", "Main_.kiss"]);
-        makeFileForNewProject(["build.hxml"]);
-        makeFileForNewProject(["test.sh"]);
-        File.saveContent(Path.join([workingDir, name, 'haxelib.json']), Json.stringify(haxelibJson, null, "\t"));
-    }
-
-    static function newFlixelProject(args:Array<String>) {
-        var title = promptFor("title");
-        var company = promptFor("creator/studio");
-        var width = Std.parseInt(promptFor("window width", "1280"));
-        var height = Std.parseInt(promptFor("window height", "720"));
-        var background = promptFor("background color", "#000000");
-
-        var kissFlixelLibPath = new Process("haxelib", ["libpath", "kiss-flixel"]).stdout.readAll().toString().trim();
-        var workingDir = Sys.args().pop();
-        FileSystem.createDirectory(Path.join([workingDir, title]));
-
-        // Substitute the specified values into the Project.xml:
-        var projectXml:Xml = Xml.parse(File.getContent(Path.join([kissFlixelLibPath, "template", "Project.xml"])));
-        var root = projectXml.elements().next();
-
-        var firstAppElement = Lambda.find(root, (node) -> node.nodeType == Xml.Element && node.nodeName == 'app');
-        firstAppElement.set("title", title);
-        firstAppElement.set("file", title);
-        firstAppElement.set("company", company);
-
-        var firstWindowElement = Lambda.find(root, (node) -> node.nodeType == Xml.Element && node.nodeName == 'window');
-        firstWindowElement.set("width", '$width');
-        firstWindowElement.set("height", '$height');
-        firstWindowElement.set("background", background);
-
-        File.saveContent(Path.join([workingDir, title, 'Project.xml']), projectXml.toString());
-        var makeFileForNewProject:haxe.Constraints.Function = _makeFileForNewProject.bind(kissFlixelLibPath, _, workingDir, title, "");
-        var makeFolderForNewProject:haxe.Constraints.Function = _makeFolderForNewProject.bind(kissFlixelLibPath, _, workingDir, title, "");
-        makeFolderForNewProject([".vscode"]);
-        makeFolderForNewProject(["assets"]);
-        makeFolderForNewProject(["source"]);
-        makeFileForNewProject(["hxformat.json"]);
-        makeFileForNewProject([".gitignore"]);
-    }
-
-    static function newExpressProject(args:Array<String>) {
-        var title = promptFor("title (lower-case!)").toLowerCase();
-        var pkg = title.replace("-", "_");
-        var kissExpressLibPath = new Process("haxelib", ["libpath", "kiss-express"]).stdout.readAll().toString().trim();
-        var workingDir = Sys.args().pop();
-        var projectDir = Path.join([workingDir, title]);
-        FileSystem.createDirectory(projectDir);
-
-        var makeFileForNewProject:haxe.Constraints.Function = _makeFileForNewProject.bind(kissExpressLibPath, _, workingDir, title, pkg);
-        var makeFolderForNewProject:haxe.Constraints.Function = _makeFolderForNewProject.bind(kissExpressLibPath, _, workingDir, title, pkg);
-        makeFolderForNewProject(["src", "template"]);
-        makeFileForNewProject([".gitignore"]);
-        makeFileForNewProject(["build.hxml"]);
-        {
-            makeFileForNewProject(["package.json"]);
-            var packageFile = Path.join([projectDir, "package.json"]);
-            var packageJson = Json.parse(File.getContent(packageFile));
-            packageJson.name = title;
-            File.saveContent(packageFile, Json.stringify(packageJson, null, "\t"));
-        }
-        makeFileForNewProject(["test.sh"]);
-    }
-
-    static function newVscodeProject(args:Array<String>) {
-		var title = promptFor("title (lower-case!)").toLowerCase();
-		var pkg = title.replace("-", "_");
-        var kissVscodeApiLibPath = new Process("haxelib", ["libpath", "kiss-vscode-api"]).stdout.readAll().toString().trim();
-        var workingDir = Sys.args().pop();
-        var projectDir = Path.join([workingDir, title]);
-        FileSystem.createDirectory(projectDir);
-
-        var makeFileForNewProject:haxe.Constraints.Function = _makeFileForNewProject.bind(kissVscodeApiLibPath, _, workingDir, title, pkg);
-        var makeFolderForNewProject:haxe.Constraints.Function = _makeFolderForNewProject.bind(kissVscodeApiLibPath, _, workingDir, title, pkg);
-        makeFolderForNewProject(["src"]);
-        makeFolderForNewProject([".vscode"]);
-        makeFileForNewProject([".gitignore"]);
-        makeFileForNewProject([".vscodeignore"]);
-        makeFileForNewProject(["README.md"]);
-        makeFileForNewProject(["build.hxml"]);
-        {
-            makeFileForNewProject(["package.json"]);
-            var packageFile = Path.join([projectDir, "package.json"]);
-            var packageJson = Json.parse(File.getContent(packageFile));
-            packageJson.name = title;
-            File.saveContent(packageFile, Json.stringify(packageJson, null, "\t"));
-        }
-        makeFileForNewProject(["test.sh"]);
-    }
-
-    static function newFirefoxProject(args:Array<String>) {
-		var title = promptFor("title (lower-case!)").toLowerCase();
-		var description = promptFor("description");
-		var pkg = title.replace("-", "_");
-        var urlPatterns = [];
-        while (true) {
-            var nextPattern = promptFor("url pattern (i.e. '*://*.mozilla.org/*') (blank to finish)", "");
-            if (nextPattern.length == 0)
-                break;
-            urlPatterns.push(nextPattern);
-        }
-        var kissFirefoxLibPath = new Process("haxelib", ["libpath", "kiss-firefox"]).stdout.readAll().toString().trim();
-        var workingDir = Sys.args().pop();
-        var projectDir = Path.join([workingDir, title]);
-        FileSystem.createDirectory(projectDir);
-
-        var makeFileForNewProject:haxe.Constraints.Function = _makeFileForNewProject.bind(kissFirefoxLibPath, _, workingDir, title, pkg);
-        var makeFolderForNewProject:haxe.Constraints.Function = _makeFolderForNewProject.bind(kissFirefoxLibPath, _, workingDir, title, pkg);
-        makeFolderForNewProject(["src"]);
-        makeFolderForNewProject(["icons"]);
-        makeFileForNewProject([".gitignore"]);
-        makeFileForNewProject(["build.hxml"]);
-        {
-            makeFileForNewProject(["manifest.json"]);
-            var manifestFile = Path.join([projectDir, "manifest.json"]);
-            var manifestJson = Json.parse(File.getContent(manifestFile));
-            manifestJson.name = title;
-            manifestJson.description = description;
-            manifestJson.content_scripts[0].matches = urlPatterns;
-            File.saveContent(manifestFile, Json.stringify(manifestJson, null, "\t"));
-        }
-        {
-            makeFileForNewProject(["package.json"]);
-            var packageFile = Path.join([projectDir, "package.json"]);
-            var packageJson = Json.parse(File.getContent(packageFile));
-            packageJson.name = title;
-            packageJson.description = description;
-            File.saveContent(packageFile, Json.stringify(packageJson, null, "\t"));
-        }
-        makeFileForNewProject(["test.sh"]);
-    }
-
-    static function convert(args:Array<String>) {
-        // `kiss convert` converts its stdin input to Haxe expressions.
-        // with --all, it reads everything from stdin at once (for piping). Without --all, it acts as a repl,
-        // where \ at the end of a line signals that the expression is not complete
-        // TODO write tests for this
-        #if macro
-        var k = Kiss.defaultKissState();
-        k.wrapListExps = false;
-        var pretty = args.indexOf("--pretty") != -1;
-
-        if (args.indexOf("--hscript") != -1)
-            k = k.forHScript();
-
-        function print(s:String) {
-            if (!pretty)
-                s = s.replace("\n", " ");
-
-            Sys.println(s);
-        }
-
-        if (args.indexOf("--all") != -1) {
-            var kissInputStream = Stream.fromString(Sys.stdin().readAll().toString());
-            Reader.readAndProcess(kissInputStream, k, (readerExp) -> {
-                print(Kiss.readerExpToHaxeExpr(readerExp, k).toString());
-            });
-        } else {
-            var line = "";
-            try {
-                while (true) {
-                    if (line.length == 0) {
-                        Sys.print(">>> ");
-                    } else {
-                        Sys.print("    ");
-                    }
-
-                    line += Sys.stdin().readLine();
-
-                    if (line.endsWith("\\")) {
-                        line = line.substr(0, line.length - 1);
-                        continue;
-                    }
-
-                    var kissInputStream = Stream.fromString(line);
-                    Reader.readAndProcess(kissInputStream, k, (readerExp) -> {
-                        print(Kiss.readerExpToHaxeExpr(readerExp, k).toString());
-                    });
-
-                    line = "";
-                }
-            } catch (e:haxe.io.Eof) {}
-        }
-        #end
-    }
-
-    // edge cases for this:
-    // TODO interfaces that extend other interfaces
-    // TODO generic interfaces
-    // TODO this could be useful for typedefs as well
-    // TODO merging a generated implementation with a Kiss file that already has some functions implemented
-    static function implement(theInterface:String) {
-        // This runs in a subprocess whose stdout output can only be read all at once,
-        // so re-implement trace to write to a file:
-        haxe.Log.trace = (v, ?infos) -> {
-            File.saveContent("implementLog.txt", "");
-            File.saveContent("implementLog.txt", File.getContent("implementLog.txt") + "\n" + Std.string(v));
-            v;
-        }
-        #if macro
-        var type = Context.resolveType(Helpers.parseComplexType(theInterface), Context.currentPos());
-        switch (type) {
-            case TInst(classTypeRef, params):
-                var classType = classTypeRef.get();
-                var fields = classType.fields.get();
-                trace(fields);
-
-                for (field in fields) {
-                    function printAccess() {
-                        if (!field.isPublic) {
-                            Sys.print("&private ");
-                        }
-                        switch (field.kind) {
-                            case FVar(_, _):
-                                if (!field.isFinal) {
-                                    Sys.print("&mut ");
-                                }
-                            default:
-                        }
-                    }
-                    function printPropertyAccess(access, getOrSet:Bool) {
-                        Sys.print(switch (access) {
-                            case AccNormal: "default";
-                            case AccNo: "null";
-                            case AccCall if (getOrSet): "get";
-                            case AccCall if (!getOrSet): "set";
-                            default: '/* TODO automatic interface property access printing is not supported for access ${access}*/';
-                        });
-                    }
-                    function printType(type, precedingColon = true, followingSpace = true, argType = false) {
-                        function _printType(t:{function get():{var name:String;}}, params:Array<Type>) {
-                            var t = t.get();
-                            Sys.print(t.name);
-                            if (params.length > 0) {
-                                Sys.print("<");
-                                var first = true;
-                                for (param in params) {
-                                    if (!first) {
-                                        Sys.print(",");
-                                    }
-                                    first = false;
-                                    printType(param, false, false);
-                                }
-                                Sys.print(">");
-                            }
-                            if (followingSpace) {
-                                Sys.print(" ");
-                            }
-                        }
-
-                        if (precedingColon) {
-                            Sys.print(":");
-                        }
-                        switch (type) {
-                            case TInst(t, params):
-                                _printType(t, params);
-                            case TEnum(t, params):
-                                _printType(t, params);
-                            case TAbstract(t, params):
-                                _printType(t, params);
-                            case TType(t, params):
-                                _printType(t, params);
-                            case TFun(args, ret) if (argType):
-                                Sys.print("(");
-                                var first = true;
-                                for (arg in args) {
-                                    if (!first) {
-                                        Sys.print(",");
-                                    }
-                                    first = false;
-                                    printType(arg.t,false,false,true);
-                                }
-                                Sys.print(")->");
-                                printType(ret, false);
-                            case TFun(_args, ret):
-                                printType(ret, false);
-                            default:
-                                Sys.print('/* TODO Automatic interface type printing is not supported for type: $type */');
-                        }
-                    }
-
-                    switch (field.kind) {
-                        case FVar(read, write):
-                            Sys.print("(prop ");
-                            printAccess();
-                            printType(field.type);
-                            Sys.print('${field.name} ');
-                            {
-                                Sys.print("(property ");
-                                printPropertyAccess(read, true);
-                                Sys.print(" ");
-                                printPropertyAccess(write, false);
-                                Sys.print(")");
-                            }
-                            Sys.print(")");
-                        case FMethod(k):
-                            Sys.print("(method ");
-                            printAccess();
-                            switch (k) {
-                                case MethNormal:
-                                case MethInline:
-                                    Sys.print("/* TODO Automatic interface implementation does not support inline methods */");
-                                case MethMacro:
-                                    throw "There should never be macro functions in an interface";
-                                case MethDynamic:
-                                    Sys.print("&dynamic ");    
-                            }
-                            printType(field.type);
-                            Sys.print('${field.name} ');
-                            Sys.print("[");
-                            switch (field.type) {
-                                case TFun(args, _ret):
-                                    var first = true;
-                                    for (arg in args) {
-                                        if (!first) {
-                                            Sys.print(" ");
-                                        }
-                                        first = false;
-                                        if (arg.opt) {
-                                            Sys.print("&opt ");
-                                        }
-                                        printType(arg.t, true, true, true);
-                                        Sys.print(arg.name);
-                                    }
-                                default:
-                                    throw "Function is not a function?";
-                            }
-
-                            Sys.print("] ");
-                            Sys.print('(throw "TODO Not implemented!")');
-                            Sys.print(")");
-                        default:
-                            Sys.print("// TODO Automatic interface implementation not supported for field:");
-                            Sys.print('/* ${Std.string(field).replace("/*", "").replace("*/", "")} */');
-                        }
-                    Sys.println("");
-                }
-            default:
-                throw 'Unexpected result from resolveType of $theInterface';
-        }
-        #end
-    }
-}
diff --git a/kiss/src/kiss/Prelude.hx b/kiss/src/kiss/Prelude.hx
deleted file mode 100644
index d6a426ea..00000000
--- a/kiss/src/kiss/Prelude.hx
+++ /dev/null
@@ -1,872 +0,0 @@
-package kiss;
-
-using Std;
-
-import kiss.ReaderExp;
-import haxe.ds.Either;
-import haxe.Constraints;
-import haxe.DynamicAccess;
-#if (!macro && hxnodejs)
-import js.node.ChildProcess;
-import js.node.Buffer;
-#elseif sys
-import sys.io.Process;
-#end
-#if (sys || hxnodejs)
-import sys.FileSystem;
-import sys.io.File;
-#end
-#if python
-import python.lib.subprocess.Popen;
-import python.Bytearray;
-#end
-import uuid.Uuid;
-import haxe.io.Path;
-import haxe.Json;
-#if target.threaded
-import sys.thread.Mutex;
-#end
-using StringTools;
-using uuid.Uuid;
-
-/** What functions that process Lists should do when there are more elements than expected **/
-enum ExtraElementHandling {
-    Keep; // Keep the extra elements
-    Drop; // Drop the extra elements
-    Throw; // Throw an error
-}
-
-enum KissTarget {
-    Cpp;
-    CSharp;
-    Haxe;
-    JavaScript;
-    NodeJS;
-    Python;
-    Macro;
-}
-
-class Prelude {
-    static function stringOrFloat(d:Dynamic):Either<String, Float> {
-        return switch (Type.typeof(d)) {
-            case TInt | TFloat: Right(0.0 + d);
-            default:
-                if (Std.isOfType(d, String)) {
-                    Left(d);
-                } else {
-                    throw 'cannot use $d in multiplication';
-                };
-        };
-    }
-
-    static function _and(values:Array<Dynamic>):Dynamic {
-        for (value in values) {
-            if (!truthy(value)) {
-                return false;
-            }
-        }
-        return values[values.length - 1];
-    }
-    public static var and:Function = Reflect.makeVarArgs(_and);
-
-    static function _or(values:Array<Dynamic>):Dynamic {
-        for (value in values) {
-            if (truthy(value)) {
-                return value;
-            }
-        }
-        return values[values.length-1];
-    }
-    public static var or:Function = Reflect.makeVarArgs(_or);
-
-    static function makeVarArgsWithArrayCheck(f:Array<Dynamic>->Dynamic, name:String):Function {
-        function fWithArrayCheck(args:Array<Dynamic>):Dynamic {
-            if (args.length == 1 && args[0] is Array) {
-                throw 'Array ${args[0]} was passed to variadic function $name. Use (apply $name args) instead';
-            }
-            return f(args);
-        }
-        return Reflect.makeVarArgs(fWithArrayCheck);
-    }
-
-    // Kiss arithmetic will incur overhead because of these switch statements, but the results will not be platform-dependent
-    static function _add(values:Array<Dynamic>):Dynamic {
-        var sum:Dynamic = values[0];
-        for (value in values.slice(1))
-            sum += value;
-        return sum;
-    }
-
-    public static var add:Function = makeVarArgsWithArrayCheck(_add, "+");
-
-    static function _subtract(values:Array<Dynamic>):Dynamic {
-        var difference:Float = values[0];
-        for (value in values.slice(1))
-            difference -= value;
-        return difference;
-    }
-
-    public static var subtract:Function = makeVarArgsWithArrayCheck(_subtract, "-");
-
-    static function _multiply2(a:Dynamic, b:Dynamic):Dynamic {
-        return switch ([stringOrFloat(a), stringOrFloat(b)]) {
-            case [Right(f), Right(f2)]:
-                f * f2;
-            case [Left(a), Left(b)]:
-                throw 'cannot multiply strings "$a" and "$b"';
-            case [Right(i), Left(s)] | [Left(s), Right(i)] if (i % 1 == 0):
-                var result = "";
-                for (_ in 0...Math.floor(i)) {
-                    result += s;
-                }
-                result;
-            default:
-                throw 'cannot multiply $a and $b';
-        };
-    }
-
-    static function _multiply(values:Array<Dynamic>):Dynamic {
-        var product = values[0];
-        for (value in values.slice(1))
-            product = _multiply2(product, value);
-        return product;
-    }
-
-    public static var multiply:Function = makeVarArgsWithArrayCheck(_multiply, "*");
-
-    static function _divide(values:Array<Dynamic>):Dynamic {
-        var quotient:Float = values[0];
-        for (value in values.slice(1))
-            quotient /= value;
-        return quotient;
-    }
-
-    public static var divide:Function = makeVarArgsWithArrayCheck(_divide, "/");
-
-    public static function mod(top:Dynamic, bottom:Dynamic):Dynamic {
-        return top % bottom;
-    }
-
-    public static function pow(base:Dynamic, exponent:Dynamic):Dynamic {
-        return Math.pow(base, exponent);
-    }
-
-    static function _min(values:Array<Dynamic>):Dynamic {
-        var min = values[0];
-        for (value in values.slice(1))
-            min = Math.min(min, value);
-        return min;
-    }
-
-    public static var min:Function = makeVarArgsWithArrayCheck(_min, "min");
-
-    static function _max(values:Array<Dynamic>):Dynamic {
-        var max = values[0];
-        for (value in values.slice(1)) {
-            max = Math.max(max, value);
-        }
-        return max;
-    }
-
-    public static var max:Function = makeVarArgsWithArrayCheck(_max, "max");
-
-    static function _comparison(op:String, values:Array<Dynamic>):Bool {
-        for (idx in 1...values.length) {
-            var a:Dynamic = values[idx - 1];
-            var b:Dynamic = values[idx];
-            var check = switch (op) {
-                case ">": a > b;
-                case ">=": a >= b;
-                case "<": a < b;
-                case "<=": a <= b;
-                case "==": a == b;
-                default: throw 'Unreachable case';
-            }
-            if (!check)
-                return false;
-        }
-        return true;
-    }
-
-    public static var greaterThan:Function = makeVarArgsWithArrayCheck(_comparison.bind(">"), ">");
-    public static var greaterEqual:Function = makeVarArgsWithArrayCheck(_comparison.bind(">="), ">=");
-    public static var lessThan:Function = makeVarArgsWithArrayCheck(_comparison.bind("<"), "<");
-    public static var lesserEqual:Function = makeVarArgsWithArrayCheck(_comparison.bind("<="), "<=");
-    public static var areEqual:Function = makeVarArgsWithArrayCheck(_comparison.bind("=="), "=");
-
-    // Like quickNths but for division. Support int and float output:
-    private static function iFraction (num:Float, denom:Float) {
-        return Std.int(num / denom);
-    }
-    public static var iHalf:Float->Int = iFraction.bind(_, 2);
-    public static var iThird:Float->Int = iFraction.bind(_, 3);
-    public static var iFourth:Float->Int = iFraction.bind(_, 4);
-    public static var iFifth:Float->Int = iFraction.bind(_, 5);
-    public static var iSixth:Float->Int = iFraction.bind(_, 6);
-    public static var iSeventh:Float->Int = iFraction.bind(_, 7);
-    public static var iEighth:Float->Int = iFraction.bind(_, 8);
-    public static var iNinth:Float->Int = iFraction.bind(_, 9);
-    public static var iTenth:Float->Int = iFraction.bind(_, 10);
-    private static function fFraction (num:Float, denom:Float) {
-        return num / denom;
-    }
-    public static var fHalf:Float->Float = fFraction.bind(_, 2);
-    public static var fThird:Float->Float = fFraction.bind(_, 3);
-    public static var fFourth:Float->Float = fFraction.bind(_, 4);
-    public static var fFifth:Float->Float = fFraction.bind(_, 5);
-    public static var fSixth:Float->Float = fFraction.bind(_, 6);
-    public static var fSeventh:Float->Float = fFraction.bind(_, 7);
-    public static var fEighth:Float->Float = fFraction.bind(_, 8);
-    public static var fNinth:Float->Float = fFraction.bind(_, 9);
-    public static var fTenth:Float->Float = fFraction.bind(_, 10);
-
-
-    public static function sort<T>(a:Array<T>, ?comp:(T, T) -> Int):kiss.List<T> {
-        if (comp == null)
-            comp = Reflect.compare;
-        var sorted = a.copy();
-        sorted.sort(comp);
-        return sorted;
-    }
-
-    public static function sortBy<T,U>(a:Array<T>, index:T->U, ?comp:(U, U) -> Int):kiss.List<T> {
-        if (comp == null)
-            comp = Reflect.compare;
-
-        return sort(a, (v1, v2) -> {
-            return comp(index(v1), index(v2));
-        });
-    }
-
-    public static function groups<T>(a:Array<T>, size, extraHandling = Throw):kiss.List<kiss.List<T>> {
-        var numFullGroups = Math.floor(a.length / size);
-        var fullGroups = [
-            for (num in 0...numFullGroups) {
-                var start = num * size;
-                var end = (num + 1) * size;
-                a.slice(start, end);
-            }
-        ];
-        if (a.length % size != 0) {
-            switch (extraHandling) {
-                case Throw:
-                    throw 'groups was given a non-divisible number of elements: $a, $size';
-                case Keep:
-                    fullGroups.push(a.slice(numFullGroups * size));
-                case Drop:
-            }
-        }
-
-        return fullGroups;
-    }
-
-    static function _concat(arrays:Array<Dynamic>):kiss.List<Dynamic> {
-        var arr:Array<Dynamic> = arrays[0];
-        for (nextArr in arrays.slice(1)) {
-            arr = arr.concat(nextArr);
-        }
-        return arr;
-    }
-
-    public static var concat:Function = Reflect.makeVarArgs(_concat);
-
-    static function _zip(iterables:Array<Dynamic>, extraHandling:ExtraElementHandling):kiss.List<kiss.List<Dynamic>> {
-        var lists = [];
-        var iterators = [for (iterable in iterables) iterable.iterator()];
-
-        while (true) {
-            var zipped:Array<Dynamic> = [];
-
-            var someNonNull = false;
-            for (it in iterators) {
-                switch (extraHandling) {
-                    case Keep:
-                        zipped.push(
-                            if (it.hasNext()) {
-                                someNonNull = true;
-                                it.next();
-                            } else {
-                                null;
-                            });
-                    default:
-                        if (it.hasNext())
-                            zipped.push(it.next());
-                }
-            }
-
-            switch (extraHandling) {
-                case _ if (zipped.length == 0):
-                    break;
-                case Keep if (!someNonNull):
-                    break;
-                case Drop if (zipped.length != iterators.length):
-                    break;
-                case Throw if (zipped.length != iterators.length):
-                    throw 'zip${extraHandling} was given iterables of mis-matched size: $iterables';
-                default:
-            }
-
-            lists.push(zipped);
-        }
-        return lists;
-    }
-
-    public static var zipKeep:Function = Reflect.makeVarArgs(_zip.bind(_, Keep));
-    public static var zipDrop:Function = Reflect.makeVarArgs(_zip.bind(_, Drop));
-    public static var zipThrow:Function = Reflect.makeVarArgs(_zip.bind(_, Throw));
-
-    static function _intersect(iterables:Array<Dynamic>):kiss.List<kiss.List<Dynamic>> {
-        var iterators:Array<Iterator<Dynamic>> = [for (iterable in iterables) iterable.iterator()];
-
-        var intersections:Array<Array<Dynamic>> = [for (elem in iterators.shift()) [elem]];
-        
-        for (iterator in iterators) {
-            intersections = cast _concat([for (elem in iterator) [for (intersection in intersections) intersection.concat([elem])]]);
-        }
-        
-        return intersections;
-    }
-
-    // Return an array of every N-dimensional intersection of elements in N iterables.
-    // Callers should not rely on the order of the intersections
-    public static var intersect:Function = Reflect.makeVarArgs(_intersect);
-
-    public static function enumerate(l:kiss.List<Dynamic>, startingIdx = 0):kiss.List<kiss.List<Dynamic>> {
-        return zipThrow(range(startingIdx, startingIdx + l.length, 1), l);
-    }
-
-    public static function pairs(l:kiss.List<Dynamic>, loopAround = false):kiss.List<kiss.List<Dynamic>> {
-        var l1 = l.slice(0, l.length - 1);
-        var l2 = l.slice(1, l.length);
-        if (loopAround) {
-            l1.push(l[-1]);
-            l2.unshift(l[0]);
-        }
-        return zipThrow(l1, l2);
-    }
-
-    public static function reverse<T>(l:kiss.List<T>):kiss.List<T> {
-        var c = l.copy();
-        c.reverse();
-        return c;
-    }
-
-    // Ranges with a min, exclusive max, and step size, just like Python.
-    public static function range(min, max, step):Iterator<Int>
-        & Iterable<Int>
-
-    {
-        if (step <= 0 || max < min)
-            throw "(range...) can only count up";
-        var count = min;
-        var iterator = {
-            next: () -> {
-                var oldCount = count;
-                count += step;
-                oldCount;
-            },
-            hasNext: () -> {
-                count < max;
-            }
-        };
-
-        return {
-            iterator: () -> iterator,
-            next: () -> iterator.next(),
-            hasNext: () -> iterator.hasNext()
-        };
-    }
-    static function _joinPath(parts:Array<Dynamic>) {
-        return Path.join([for (part in parts) cast(part, String)]);
-    }
-
-    public static var joinPath:Function = Reflect.makeVarArgs(_joinPath);
-
-    public static function isNull<T>(v:T) {
-        return switch (Type.typeof(v)) {
-            case TNull: true;
-            default: false;
-        }
-    }
-
-    public static dynamic function truthy<T>(v:T) {
-        return switch (Type.typeof(v)) {
-            case TNull: false;
-            case TBool: cast(v, Bool);
-            default:
-                // Empty strings are falsy
-                if (v.isOfType(String)) {
-                    var str:String = cast v;
-                    str.length > 0;
-                } else if (v.isOfType(Array)) {
-                    // Empty lists are falsy
-                    var lst:Array<Dynamic> = cast v;
-                    lst.length > 0;
-                } else {
-                    // Any other value is true by default
-                    true;
-                };
-        }
-    }
-
-    public static function chooseRandom<T>(l:kiss.List<T>) {
-        return l[Std.random(l.length)];
-    }
-
-    // Based on: http://old.haxe.org/doc/snip/memoize
-    public static function memoize(func:Function, ?caller:Dynamic, ?jsonFile:String, ?jsonArgMap:Map<String, Dynamic>):Function {
-        var argMap = if (jsonArgMap != null) {
-            jsonArgMap;
-        } else {
-            new Map<String, Dynamic>();
-        }
-        var f = (args:Array<Dynamic>) -> {
-            var argString = args.join('|');
-            return if (argMap.exists(argString)) {
-                argMap[argString];
-            } else {
-                var ret = Reflect.callMethod(caller, func, args);
-                argMap[argString] = ret;
-                #if (sys || hxnodejs)
-                if (jsonFile != null) {
-                    File.saveContent(jsonFile, Json.stringify(argMap));
-                }
-                #end
-                ret;
-            };
-        };
-        f = Reflect.makeVarArgs(f);
-        return f;
-    }
-
-    #if (sys || hxnodejs)
-    public static function fsMemoize(func:Function, funcName:String, cacheDirectory = "", ?caller:Dynamic):Function {
-        var fileName = '${funcName}.memoized';
-        if (cacheDirectory.length > 0) {
-            FileSystem.createDirectory(cacheDirectory);
-            fileName = '$cacheDirectory/$fileName';
-        }
-        if (!FileSystem.exists(fileName))
-            File.saveContent(fileName, "{}");
-
-        var pastResults:DynamicAccess<Dynamic> = Json.parse(File.getContent(fileName));
-        var argMap:Map<String, Dynamic> = [for (key => value in pastResults) key => value];
-        return memoize(func, caller, fileName, argMap);
-    }
-    #end
-
-    public static function _printStr(s:String) {
-        #if (sys || hxnodejs)
-        Sys.println(s);
-        #else
-        trace(s);
-        #end
-    }
-
-    #if (sys || hxnodejs)
-    static var externLogFile = "externLog.txt";
-
-    public static function _externPrintStr(s:String) {
-        var logContent = try {
-            File.getContent(externLogFile);
-        } catch (e) {
-            "";
-        }
-        File.saveContent(externLogFile, '${logContent}${s}\n');
-    }
-    #end
-
-    public static var printStr:(String) -> Void = _printStr;
-
-    public static function withLabel(v:Any, label = "") {
-        var toPrint = label;
-        if (label.length > 0) {
-            toPrint += ": ";
-        }
-        toPrint += Std.string(v);
-        return toPrint;
-    }
-
-    public static function print<T>(v:T, label = ""):T {
-        var toPrint = withLabel(v, label);
-        printStr(toPrint);
-        return v;
-    }
-
-    public static function symbolNameValue(s:ReaderExp, allowTyped:Null<Bool> = false, allowMeta:Null<Bool> = false):String {
-        return switch (s.def) {
-            case Symbol(name): name;
-            case TypedExp(_, innerExp) if (allowTyped): symbolNameValue(innerExp, false); // Meta must always precede type annotation
-            case MetaExp(_, innerExp) if (allowMeta): symbolNameValue(innerExp, allowTyped, false); // TODO will more than one meta on the same expression be necessary?
-            default: throw 'expected $s to be a plain symbol'; // TODO convert s def to print & modify this message to reflect allowTyped and allowMeta parameters
-        };
-    }
-
-    public static function uuid() {
-        return Uuid.v4().toShort();
-    }
-
-    // ReaderExp helpers for macros:
-    public static function symbol(?name:String):ReaderExpDef {
-        if (name == null)
-            name = '_${Uuid.v4().toShort()}'; // TODO the underscore will make fields defined with gensym names all PRIVATE!
-        return Symbol(name);
-    }
-
-    // TODO make this behavior DRY with symbolNameValue
-    public static function symbolName(s:ReaderExp, allowTyped:Null<Bool> = false, allowMeta:Null<Bool> = false):ReaderExpDef {
-        return switch (s.def) {
-            case Symbol(name): StrExp(name);
-            case TypedExp(_, innerExp) if (allowTyped): symbolName(innerExp, false); // Meta must always precede type annotation
-            case MetaExp(_, innerExp) if (allowMeta): symbolName(innerExp, allowTyped, false); // TODO will more than one meta on the same expression be necessary?
-            default: throw 'expected $s to be a plain symbol'; // TODO convert s def to print & modify this message to reflect allowTyped and allowMeta parameters;
-        };
-    }
-
-    public static function expList(s:ReaderExp):kiss.List<ReaderExp> {
-        return switch (s.def) {
-            case ListExp(exps):
-                exps;
-            default: throw 'expected $s to be a list expression';
-        };
-    }
-    
-    public static function isListExp(s:ReaderExp):Bool {
-        return switch (s.def) {
-            case ListExp(exps):
-                true;
-            default:
-                false;
-        };
-    }
-
-    #if sys
-    private static var kissProcess:Process = null;
-    #end
-
-    public static function walkDirectory(basePath, directory, processFile:(String) -> Void, ?filterFolderBefore:(String) -> Bool,
-            ?processFolderAfter:(String) -> Void) {
-        #if (sys || hxnodejs)
-        for (fileOrFolder in FileSystem.readDirectory(joinPath(basePath, directory))) {
-            switch (fileOrFolder) {
-                case folder if (FileSystem.isDirectory(joinPath(basePath, directory, folder))):
-                    var subdirectory = joinPath(directory, folder);
-                    if (filterFolderBefore != null) {
-                        if (filterFolderBefore(subdirectory)) {
-                            continue;
-                        }
-                    }
-                    walkDirectory(basePath, subdirectory, processFile, filterFolderBefore, processFolderAfter);
-                    if (processFolderAfter != null) {
-                        processFolderAfter(subdirectory);
-                    }
-                case file:
-                    processFile(joinPath(directory, file));
-            }
-        }
-        #else
-        throw "Can't walk a directory on this target.";
-        #end
-    }
-
-    public static function purgeDirectory(directory) {
-        #if (sys || hxnodejs)
-        walkDirectory("", directory, FileSystem.deleteFile, null, FileSystem.deleteDirectory);
-        FileSystem.deleteDirectory(directory);
-        #else
-        throw "Can't delete files/folders on this target.";
-        #end
-    }
-
-    /**
-     * On Sys targets and nodejs, Kiss can be converted to hscript at runtime
-     * NOTE on non-nodejs targets, after the first time calling this function,
-     * it will be much faster -- but things like reader macros will get stuck in the KissState, which you may not intend
-     * NOTE on non-nodejs sys targets, newlines in raw strings will be stripped away.
-     * So don't use raw string literals in Kiss you want parsed and evaluated at runtime.
-     */
-    public static function convertToHScript(kissStr:String):String {
-        #if macro
-        return Kiss.measure("Prelude.convertToHScript", () -> {
-        #end
-            #if (!macro && hxnodejs)
-            var hscript = try {
-                assertProcess("haxelib", ["run", "kiss", "convert", "--all", "--hscript"], kissStr.split('\n'));
-            } catch (e) {
-                throw 'failed to convert ${kissStr} to hscript:\n$e';
-            }
-            if (hscript.startsWith(">>> ")) {
-                hscript = hscript.substr(4);
-            }
-            return hscript.trim();
-            #elseif (!macro && python)
-            var hscript = try {
-                assertProcess("haxelib", ["run", "kiss", "convert", "--hscript"], [kissStr.replace('\n', ' ')], false);
-            } catch (e) {
-                throw 'failed to convert ${kissStr} to hscript:\n$e';
-            }
-            if (hscript.startsWith(">>> ")) {
-                hscript = hscript.substr(4);
-            }
-            return hscript.trim();
-            #elseif sys
-            if (kissProcess == null)
-                kissProcess = new Process("haxelib", ["run", "kiss", "convert", "--hscript"]);
-
-            kissProcess.stdin.writeString('${kissStr.replace("\n", " ")}\n');
-
-            try {
-                var output = kissProcess.stdout.readLine();
-                if (output.startsWith(">>> ")) {
-                    output = output.substr(4);
-                }
-                return output;
-            } catch (e) {
-                var error = kissProcess.stderr.readAll().toString();
-                throw 'failed to convert ${kissStr} to hscript: ${error}';
-            }
-            #else
-            throw "Can't convert Kiss to HScript on this target.";
-            #end
-        #if macro
-        }, true);
-        #end
-    }
-
-    #if (sys || hxnodejs)
-    public static function userHome() {
-        var msysHome = Sys.getEnv("MSYSHOME");
-        var home = Sys.getEnv("HOME");
-        var userProfile = Sys.getEnv("UserProfile");
-        return if (msysHome != null)
-            msysHome;
-        else if (home != null)
-            home;
-        else if (userProfile != null)
-            userProfile;
-        else
-            throw "Cannot find user's home directory";
-    }
-
-    public static var cachedConvertToHScript:String->String = cast(fsMemoize(convertToHScript, "convertToHScript", '${userHome()}/.kiss-cache'));
-    #end
-
-    public static function getTarget():KissTarget {
-        return #if cpp
-            Cpp;
-        #elseif cs
-            CSharp;
-        #elseif interp
-            Haxe;
-        #elseif hxnodejs
-            NodeJS;
-        #elseif js
-            JavaScript;
-        #elseif python
-            Python;
-        #elseif macro
-            Macro;
-        #else
-            throw "Unsupported target language for Kiss";
-        #end
-    }
-
-    public static function assertProcess(command:String, args:Array<String>, ?inputLines:Array<String>, fullProcess = true, cwd = null):String {
-        return tryProcess(command, args, (error) -> { throw error; }, inputLines, fullProcess, cwd);    
-    }
-    
-    public static function tryProcess(command:String, args:Array<String>, handleError:String->Void, ?inputLines:Array<String>, fullProcess = true, cwd:String = null):String {
-        #if test
-        Prelude.print('running $command $args $inputLines from ${Prelude.getTarget()}');
-        #end
-        if (inputLines != null) {
-            for (line in inputLines) {
-                if (line.indexOf("\n") != -1) {
-                    handleError('newline is not allowed in the middle of a process input line: "${line.replace("\n", "\\n")}"');
-                    return null;
-                }
-            }
-        }
-        #if python
-        // on Python, after new Process() is called, writing inputLines to stdin becomes impossible. Use python.lib.subprocess instead
-        var p = try {
-            Popen.create([command].concat(args), {
-                stdin: -1, // -1 represents PIPE which allows communication
-                stdout: -1,
-                stderr: -1,
-                cwd: cwd
-            });
-        } catch (e:Dynamic) {
-            handleError(Std.string(e));
-            return null;
-        }
-        if (inputLines != null) {
-            for (line in inputLines) {
-                p.stdin.write(new Bytearray('$line\n', "utf-8"));
-            }
-        }
-
-        var output = if (fullProcess) {
-            if (p.wait() == 0) {
-                p.stdout.readall().decode().trim();
-            } else {
-                handleError('process $command $args failed:\n${p.stdout.readall().decode().trim() + p.stderr.readall().decode().trim();}');
-                return null;
-            }
-        } else {
-            // The haxe extern for FileIO.readline() says it's a string, but it's not, it's bytes!
-            var bytes:Dynamic = p.stdout.readline();
-            var s:String = bytes.decode();
-            s.trim();
-        }
-        p.terminate();
-        return output;
-        #elseif sys
-        var lastCwd = Sys.getCwd();
-        if (cwd != null) {
-            #if java
-            throw 'Kiss cannot specify the working directory of a subprocess in Java';
-            #end
-            Sys.setCwd(cwd);
-        }
-        try {
-            var p = new Process(command, args);
-            if (inputLines != null) {
-                for (line in inputLines) {
-                    p.stdin.writeString('$line\n');
-                }
-            }
-            var output =
-                #if !cs
-                if (fullProcess) {
-                    if (p.exitCode() == 0) {
-                        p.stdout.readAll().toString().trim();
-                    } else {
-                        handleError('process $command $args failed:\n${p.stdout.readAll().toString().trim() + p.stderr.readAll().toString().trim()}');
-                        return null;
-                    }
-                } else
-                #end
-                    p.stdout.readLine().toString().trim();
-            #if !cs
-            p.kill();
-            p.close();
-            #end
-            if (cwd != null) {
-                Sys.setCwd(lastCwd);
-            }
-            return output;
-        } catch (e) {
-            handleError('process $command $args failed: $e');
-            return null;
-        }
-        #elseif hxnodejs
-        var p = if (inputLines != null) {
-            ChildProcess.spawnSync(command, args, {input: inputLines.join("\n"), cwd: cwd});
-        } else {
-            ChildProcess.spawnSync(command, args, {cwd: cwd});
-        }
-        var output = switch (p.status) {
-            case 0:
-                var output:Buffer = p.stdout;
-                if (output == null) output = Buffer.alloc(0);
-                output.toString();
-            default:
-                var output:Buffer = p.stdout;
-                if (output == null) output = Buffer.alloc(0);
-                var error:Buffer = p.stderr;
-                if (error == null) error = Buffer.alloc(0);
-                handleError('process $command $args failed:\n${output.toString() + error.toString()}');
-                return null;
-        }
-        return output.trim();
-        #else
-        handleError("Can't run a subprocess on this target.");
-        return null;
-        #end
-    }
-
-    // Get the path to a haxelib the user has installed
-    public static function libPath(haxelibName:String) {
-        return assertProcess("haxelib", ["libpath", haxelibName]).trim();
-    }
-
-    #if target.threaded
-    static var shellCountMutex = new Mutex();
-    #end
-
-    static var shellCount = 0;
-
-    public static function shellExecute(script:String, shell:String) {
-        #if (sys || hxnodejs)
-        if (shell.length == 0) {
-            shell = if (Sys.systemName() == "Windows") "cmd /c" else "bash";
-        }
-
-        #if target.threaded
-        shellCountMutex.acquire();
-        #end
-        var tempScript = 'tempScript${shellCount++}.${shell.split(" ")[0]}';
-        #if target.threaded
-        shellCountMutex.release();
-        #end
-        
-        File.saveContent(tempScript, script);
-        try {
-            if (Sys.systemName() != "Windows") tempScript = joinPath(Sys.getCwd(), tempScript);
-            var parts = shell.split(" ").concat([tempScript]);
-            var shell = parts.shift();
-            assertProcess(shell, parts);
-            FileSystem.deleteFile(tempScript);
-        } catch (e) {
-            printStr('# Failing script:');
-            printStr(script);
-            printStr('#################');
-            FileSystem.deleteFile(tempScript);
-            throw e;
-        }
-
-        #else
-        throw "Can't run a shell script on this target.";
-        #end
-    }
-
-    public static function filter<T>(l:Iterable<T>, ?p:(T) -> Bool):kiss.List<T> {
-        if (p == null)
-            p = Prelude.truthy;
-        return Lambda.filter(l, p);
-    }
-
-    #if (sys || hxnodejs)
-    public static function readDirectory(dir:String) {
-        return [for (file in FileSystem.readDirectory(dir)) {
-            joinPath(dir, file);
-        }];
-    }
-    #end
-
-    // TODO this could get confusing, because its behavior (index to index) is the opposite of haxe substr.
-    public static function substr(str:String, startIdx:Int, ?endIdx:Int) {
-        function negIdx(idx) {
-            return if (idx < 0) str.length + idx else idx;
-        }
-
-        if (endIdx == null) endIdx = str.length;
-
-        return str.substring(negIdx(startIdx), negIdx(endIdx));
-    }
-
-    public static function runtimeInsertAssertionMessage(message:String, error:String, colonsInPrefix:Int) {
-        var colonIdx = 0;
-        for (_ in 0...colonsInPrefix) {
-            colonIdx = error.indexOf(":", colonIdx) + 1;
-        }
-        colonIdx += 1;
-        return error.substr(0, colonIdx) + message + error.substr(colonIdx);
-    }
-
-    public static var newLine = "\n";
-    public static var backSlash = "\\";
-    public static var doubleQuote = "\"";
-    public static var dollar = "$";
-}
diff --git a/kiss/src/kiss/Reader.hx b/kiss/src/kiss/Reader.hx
deleted file mode 100644
index d03c6ab1..00000000
--- a/kiss/src/kiss/Reader.hx
+++ /dev/null
@@ -1,598 +0,0 @@
-package kiss;
-
-import haxe.ds.Option;
-import kiss.Stream;
-import kiss.Kiss;
-import kiss.ReaderExp;
-
-using kiss.Reader;
-using kiss.Stream;
-using kiss.Helpers;
-using StringTools;
-
-class UnmatchedBracketSignal {
-    public var type:String;
-    public var position:Stream.Position;
-
-    public function new(type, position) {
-        this.type = type;
-        this.position = position;
-    }
-}
-
-typedef ReadFunction = (Stream, KissState) -> Null<ReaderExpDef>;
-typedef ReadTable = Map<String, ReadFunction>;
-
-class Reader {
-    // The built-in readtable
-    public static function builtins() {
-        var readTable:ReadTable = [];
-
-        readTable["("] = (stream, k) -> {
-            var pos = stream.position();
-            CallExp(assertRead(stream, k), readExpArray(stream, ")", k, pos));
-        };
-
-        readTable["@"] = (stream, k) -> HaxeMeta(nextToken(stream, "a haxe metadata entry name"), null, assertRead(stream, k));
-        readTable["@("] = (stream, k) -> HaxeMeta(nextToken(stream, "a haxe metadata entry name"), readExpArray(stream, ")", k), assertRead(stream, k));
-
-        readTable["["] = (stream, k) -> ListExp(readExpArray(stream, "]", k));
-        readTable["[::"] = (stream, k) -> ListEatingExp(readExpArray(stream, "]", k));
-        readTable["..."] = (stream, k) -> ListRestExp(nextToken(stream, "name for list-eating rest exp", true));
-
-        // Provides a nice syntactic sugar for (if... {<then block...>} {<else block...>}),
-        // and also handles string interpolation cases like "${exp}moreString":
-        readTable["{"] = (stream:Stream, k) -> CallExp(Symbol("begin").withPos(stream.position()), readExpArray(stream, "}", k));
-
-        readTable["<>["] = (stream, k) -> TypeParams(readExpArray(stream, "]", k));
-
-        readTable['"'] = readString.bind(_, _, false);
-        readTable["#"] = readRawString;
-
-        // Special symbols that wouldn't read as symbols, but should:
-        function forceSymbol(sym:String) {
-            readTable[sym] = (stream, k) -> Symbol(sym);
-        }
-        forceSymbol("#if");
-        forceSymbol("#when");
-        forceSymbol("#unless");
-        forceSymbol("#cond");
-        forceSymbol("#case");
-        forceSymbol("#extern");
-        forceSymbol("#value");
-        forceSymbol("#symbol");
-
-        readTable["/*"] = (stream:Stream, k) -> {
-            stream.takeUntilAndDrop("*/");
-            null;
-        };
-        readTable["//"] = (stream:Stream, k) -> {
-            stream.takeUntilAndDrop("\n");
-            null;
-        }; 
-        // Special comment syntax that disables the next whole reader expression:
-        readTable["**"] = (stream:Stream, k) -> {
-            assertRead(stream, k);
-            null;
-        };
-
-        readTable["'"] = (stream:Stream, k) -> {
-            CallExp(Symbol("quote").withPos(stream.position()), [assertRead(stream, k)]);
-        };
-
-        readTable["#|"] = (stream:Stream, k) -> {
-            var pos = stream.position();
-            var haxe = stream.expect("closing |#", () -> stream.takeUntilAndDrop("|#"));
-            var def = RawHaxe(haxe);
-            var haxeWithSemi = haxe.trim();
-            if (!haxeWithSemi.endsWith(";"))
-                haxeWithSemi += ";";
-            KissError.warnFromExp(def.withPos(pos), '#|rawHaxe()|# expressions are deprecated because they only parse one statement and ignore the rest. Try this: #{$haxeWithSemi}#');
-            def;
-        };
-
-        readTable["#{"] = (stream:Stream, k) -> {
-            RawHaxeBlock(stream.expect("closing }#", () -> stream.takeUntilAndDrop("}#")));
-        };
-
-        readTable[":"] = (stream:Stream, k) -> TypedExp(stream.expect("a type path", () -> stream.takeUntilOneOf(whitespace)), assertRead(stream, k));
-
-        readTable["&"] = (stream:Stream, k) -> MetaExp(nextToken(stream, "a meta symbol like mut, optional, rest"), assertRead(stream, k));
-
-        readTable["!"] = (stream:Stream, k) -> CallExp(Symbol("not").withPos(stream.position()), [assertRead(stream, k)]);
-
-        // Helpful for quickly debugging an expression by printing the value:
-        readTable["~"] = (stream:Stream, k) -> {
-            var pos = stream.position();
-            var expToPrint = assertRead(stream, k);
-            var expToPrintRepresentation = StrExp(Reader.toString(expToPrint.def)).withPos(pos);
-            CallExp(Symbol("print").withPos(pos), [expToPrint, expToPrintRepresentation]);
-        }
-
-        // Helpful for defining predicates to pass to Haxe functions:
-        readTable["?"] = (stream:Stream, k) -> CallExp(Symbol("Prelude.truthy").withPos(stream.position()), [assertRead(stream, k)]);
-
-        // Lets you dot-access a function result without binding it to a name
-        readTable["."] = (stream:Stream, k) -> FieldExp(nextToken(stream, "a field name"), assertRead(stream, k), false);
-        // Safe version (new feature of Haxe 4.3.0)
-        readTable["?."] = (stream:Stream, k) -> FieldExp(nextToken(stream, "a field name"), assertRead(stream, k), true);
-
-        // Lets you construct key-value pairs for map literals or for-loops
-        readTable["=>"] = (stream:Stream, k) -> KeyValueExp(assertRead(stream, k), assertRead(stream, k));
-
-        function unmatchedBracket(b:String) {
-            readTable[b] = (stream:Stream, k) -> {
-                stream.putBackString(b);
-                throw new UnmatchedBracketSignal(b, stream.position());
-            };
-        }
-
-        unmatchedBracket(")");
-        unmatchedBracket("]");
-        unmatchedBracket("}");
-
-        readTable["`"] = (stream:Stream, k) -> Quasiquote(assertRead(stream, k));
-        readTable[","] = (stream:Stream, k) -> Unquote(assertRead(stream, k));
-        readTable[",@"] = (stream:Stream, k) -> UnquoteList(assertRead(stream, k));
-
-        // Command line syntax:
-        readTable["```"] = (stream:Stream, k) -> {
-            var shell = switch (stream.takeLine()) {
-                case Some(shell): shell;
-                default: "";
-            };
-            var pos = stream.position();
-            var script = readString(stream, k, true).withPos(pos);
-            CallExp(
-                Symbol("Prelude.shellExecute").withPos(pos), [
-                    script,
-                    StrExp(shell).withPos(pos)
-                ]);
-        };
-
-        // Lambda arrow syntaxes:
-        //     ->[args] body
-        //     ->arg body
-        //     ->{body}
-        //     ->(body)
-        // OR, for countingLambda:
-        //     -+>countVar [args] body
-        //     -+>countVar arg body
-        //     -+>countVar {body}
-        //     -+>countVar (body)
-        // or any of those with the first expression after -> or -+> prefixed by :Void
-        function arrowSyntax(countingLambda:Bool, stream:Stream, k:KissState) {
-            var countVar = if (countingLambda) {
-                assertRead(stream, k);
-            } else {
-                null;
-            }
-            var firstExp = assertRead(stream, k);
-            var b = firstExp.expBuilder();
-
-            var argsExp:ReaderExp = null;
-            var bodyExp:ReaderExp = null;
-
-            var returnsValue = true;
-            switch (firstExp.def) {
-                case TypedExp("Void", realFirstExp):
-                    firstExp = realFirstExp;
-                    returnsValue = false;
-                default:
-            }
-            switch (firstExp.def) {
-                case ListExp(_):
-                    argsExp = firstExp;
-                    bodyExp = assertRead(stream, k);
-                case Symbol(_):
-                    argsExp = b.list([firstExp]);
-                    bodyExp = assertRead(stream, k);
-                case CallExp(_, _):
-                    argsExp = b.list([]);
-                    bodyExp = firstExp;
-                default:
-                    throw KissError.fromExp(firstExp, "first expression after -> should be [args...], arg, (exp) or {body}, or one of those prefixed with :Void. When an argument type must be specified, even a single argument name must be put in brackets. For example: ->[:ArgType arg] <exp>");
-            }
-            if (!returnsValue) {
-                argsExp = TypedExp("Void", argsExp).withPosOf(argsExp);
-            }
-            return if (countingLambda) {
-                CallExp(b.symbol("countingLambda"), [countVar, argsExp, bodyExp]);
-            } else {
-                CallExp(b.symbol("lambda"), [argsExp, bodyExp]);
-            };
-        }
-
-        readTable["->"] = arrowSyntax.bind(false);
-        readTable["-+>"] = arrowSyntax.bind(true);
-
-        // Because macro keys are sorted by length and peekChars(0) returns "", this will be used as the default reader macro:
-        readTable[""] = (stream:Stream, k:KissState) -> {
-            var position = stream.position();
-            var token = nextToken(stream, "a symbol name");
-            // Process dot-access on alias identifiers
-            return if (token.indexOf(".") != -1) {
-                if (!Math.isNaN(Std.parseFloat(token))) {
-                    Symbol(token);
-                } else {
-                    var tokenParts = token.split(".");
-                    var fieldExpVal = tokenParts[0];
-                    if (fieldExpVal.endsWith("?"))
-                        fieldExpVal = fieldExpVal.substr(0, fieldExpVal.length - 1);
-                    var fieldExp = null;
-                    var firstPart = true;
-                    var nextIsSafe = false;
-                    if (k.identAliases.exists(fieldExpVal)) {
-                        while (tokenParts.length > 0) {
-                            var nextPart = tokenParts.shift();
-                            var isSafe = nextPart.endsWith("?");
-                            if (isSafe)
-                                nextPart = nextPart.substr(0, nextPart.length - 1);
-                            fieldExp = if (fieldExp == null) {
-                                k.identAliases[fieldExpVal].withPos(position);
-                            } else {
-                                fieldExp = FieldExp(nextPart, fieldExp, nextIsSafe).withPos(position);
-                            }
-                            nextIsSafe = isSafe;
-                        }
-                        fieldExp.def;
-                    } else {
-                        Symbol(token);
-                    }
-                }
-            } else {
-                Symbol(token);
-            };
-        }
-
-        return readTable;
-    }
-
-    public static final whitespace = [" ", "\t", "\n"];
-    public static final terminators = [")", "]", "}", '"', "/*"].concat(whitespace);
-
-    public static function nextToken(stream:Stream, expect:String, allowEmptyString = false) {
-        switch (stream.takeUntilOneOf(terminators, true)) {
-            case Some(tok) if (tok.length > 0 || allowEmptyString):
-                return tok;
-            default:
-                stream.error('Expected $expect');
-                return null;
-        }
-    }
-
-    public static function assertRead(stream:Stream, k:KissState):ReaderExp {
-        var position = stream.position();
-        return switch (read(stream, k)) {
-            case Some(exp):
-                exp;
-            case None:
-                stream.error('Ran out of Kiss expressions');
-                return null;
-        };
-    }
-
-    static function chooseReadFunction(stream:Stream, readTable:ReadTable):Null<ReadFunction> {
-        var readTableKeys = [for (key in readTable.keys()) key];
-        readTableKeys.sort((a, b) -> b.length - a.length);
-
-        for (key in readTableKeys) {
-            switch (stream.peekChars(key.length)) {
-                case Some(ky) if (ky == key):
-                    stream.dropString(key);
-                    return readTable[key];
-                default:
-            }
-        }
-
-        return null;
-    }
-
-    public static function read(stream:Stream, k:KissState):Option<ReaderExp> {
-        var readTable = k.readTable;
-        stream.dropWhitespace();
-
-        if (stream.isEmpty())
-            return None;
-
-        var position = stream.position();
-
-        var readFunction = null;
-        if (stream.startOfLine)
-            readFunction = chooseReadFunction(stream, k.startOfLineReadTable);
-        if (readFunction != null)
-            stream.startOfLine = false;
-        else
-            readFunction = chooseReadFunction(stream, k.readTable);
-        // This should never happen, because there is a readFunction for "":
-        if (readFunction == null)
-            throw 'No macro to read next expression';
-
-        var expOrNull = readFunction(stream, k);
-        return if (expOrNull != null) {
-            Some(expOrNull.withPos(position));
-        } else {
-            read(stream, k);
-        }
-    }
-
-    public static function readExpArray(stream:Stream, end:String, k:KissState, allowEof=false, startingPos=null):Array<ReaderExp> {
-        var array = [];
-        if (startingPos == null)
-            startingPos = stream.position();
-        while (!stream.startsWith(end)) {
-            stream.dropWhitespace();
-            if (!stream.startsWith(end)) {
-                try {
-                    switch (read(stream, k)) {
-                        case Some(exp):
-                            array.push(exp);
-                        case None:
-                            if (allowEof) return array;
-                            else throw new StreamError(startingPos, 'Ran out of expressions before $end was found.');
-                    }
-                } catch (s:UnmatchedBracketSignal) {
-                    if (s.type == end)
-                        break;
-                    else
-                        throw s;
-                }
-            }
-        }
-        stream.dropString(end);
-        return array;
-    }
-
-    /**
-        Read all the expressions in the given stream, processing them one by one while reading.
-        They can't be read all at once because some expressions change the Readtable state
-    **/
-    public static function readAndProcess(stream:Stream, k:KissState, process:(ReaderExp) -> Void) {
-        for (key => func in k.startOfFileReadTable) {
-            if (stream.startsWith(key)) {
-                var pos = stream.position();
-                stream.dropString(key);
-                var v = func(stream, k);
-                if (v != null)
-                    process(v.withPos(pos));
-                break;
-            }
-        }
-
-        while (true) {
-            stream.dropWhitespace();
-            for (key => func in k.endOfFileReadTable) {
-                if (stream.content == key) {
-                    var pos = stream.position();
-                    stream.dropString(key);
-                    var v = func(stream, k);
-                    if (v != null)
-                        process(v.withPos(pos));
-                    break;
-                }
-            }
-
-            if (stream.isEmpty())
-                break;
-            var position = stream.position();
-            var nextExp = Reader.read(stream, k);
-            // The last expression might be a comment, in which case None will be returned
-            switch (nextExp) {
-                case Some(nextExp):
-                    process(nextExp);
-                case None:
-                    stream.dropWhitespace(); // If there was a comment, drop whitespace that comes after
-            }
-        }
-    }
-
-    public static function withPos(def:ReaderExpDef, pos:Position) {
-        return {
-            pos: pos,
-            def: def
-        };
-    }
-
-    public static function withPosOf(def:ReaderExpDef, exp:ReaderExp) {
-        return {
-            pos: exp.pos,
-            def: def
-        };
-    }
-
-    // Read a string literal OR a shell section which supports interpolation
-    static function readString(stream:Stream, k:KissState, shell = false) {
-        var pos = stream.position();
-        var stringParts:Array<ReaderExp> = [];
-        var currentStringPart = "";
-
-        function endCurrentStringPart() {
-            stringParts.push(StrExp(currentStringPart).withPos(pos));
-            currentStringPart = "";
-        }
-
-        var terminator = if (shell) "```" else '"';
-        var escapes = ["$" => "$"];
-        if (!shell) {
-            escapes['\\'] = '\\';
-            escapes['t'] = '\t';
-            escapes['n'] = '\n';
-            escapes['r'] = '\r';
-            escapes['"'] = '"';
-        }
-
-        do {
-            var next = switch (stream.takeChars(1)) {
-                case Some(c): c;
-                default: 
-                    var type = if (shell) "shell block" else "string literal";
-                    throw new StreamError(pos, 'Unterminated $type. Expected $terminator');
-            }
-
-            switch (next) {
-                case '$':
-                    endCurrentStringPart();
-                    var wrapInIf = false;
-                    var firstAfterDollar = stream.expect('interpolation expression', () -> stream.peekChars(1));
-                    if (firstAfterDollar == '"') {
-                        throw new StreamError(pos, "$ at end of string should be prefixed with \\ or followed by an expression to interpolate");
-                    }
-                    if (firstAfterDollar == "?") {
-                        wrapInIf = true;
-                        stream.dropChars(1);
-                    }
-                    var interpExpression = assertRead(stream, k);
-                    var b = interpExpression.expBuilder();
-                    var stringOfInterpExpression = b.callSymbol("Std.string", [interpExpression]);
-                    if (wrapInIf) {
-                        interpExpression = b.callSymbol("if", [interpExpression, stringOfInterpExpression, b.str("")]);
-                    } else {
-                        interpExpression = stringOfInterpExpression;
-                    }
-                    stringParts.push(interpExpression);
-                case '\\':
-                    var escapeSequence = stream.expect('valid escape sequence', () -> stream.takeChars(1));
-                    if (escapes.exists(escapeSequence)) {
-                        currentStringPart += escapes[escapeSequence];
-                    } else {
-                        stream.error('unsupported escape sequence \\$escapeSequence');
-                        return null;
-                    }
-                case t if (terminator.startsWith(t)):
-                    if (terminator.length == 1 ||
-                        switch (stream.takeChars(terminator.length - 1)) {
-                            case Some(rest) if (rest == terminator.substr(1)):
-                                true;
-                            case Some(other):
-                                stream.putBackString(other);
-                                false;
-                            default:
-                                throw new StreamError(pos, 'Unterminated shell block. Expected $terminator');
-                        }) {
-                        endCurrentStringPart();
-                        return if (stringParts.length == 1) {
-                            stringParts[0].def;
-                        } else {
-                            var b = stringParts[0].expBuilder();
-                            b.the(b.symbol("String"), b.callSymbol("+", stringParts)).def;
-                        };
-                    } else {
-                        currentStringPart += t;
-                    }
-                default:
-                    currentStringPart += next;
-            }
-        } while (true);
-    }
-
-    // Read a raw string literal
-    static function readRawString(stream:Stream, k:KissState) {
-        var terminator = '"#';
-        do {
-            var next = stream.expect('# or "', () -> stream.takeChars(1));
-            switch (next) {
-                case "#":
-                    terminator += "#";
-                case '"':
-                    break;
-                default:
-                    stream.error('Invalid syntax for raw string.');
-                    return null;
-            }
-        } while (true);
-
-        var startingPos = stream.position();
-        // TODO here, give the position of the start of the literal if expect fails
-
-        return switch (stream.takeUntilAndDrop(terminator)) {
-            case Some(str):
-                StrExp(str);
-            default:
-                throw new StreamError(startingPos, 'Unterminated string literal. Expected $terminator');
-        };
-    }
-
-    public static function toString(exp:ReaderExpDef) {
-        return switch (exp) {
-            case CallExp(func, args):
-                // (f a1 a2...)
-                var str = '(' + func.def.toString();
-                if (args.length > 0)
-                    str += " ";
-                str += [
-                    for (arg in args) {
-                        arg.def.toString();
-                    }
-                ].join(" ");
-                str += ')';
-                str;
-            case ListExp(exps):
-                // [v1 v2 v3]
-                var str = '[';
-                str += [
-                    for (exp in exps) {
-                        exp.def.toString();
-                    }
-                ].join(" ");
-                str += ']';
-                str;
-            case TypeParams(exps):
-                // <>[T1 T2 T3]
-                var str = '<>[';
-                str += [
-                    for (exp in exps) {
-                        exp.def.toString();
-                    }
-                ].join(" ");
-                str += ']';
-                str;
-            case StrExp(s):
-                // "literal"
-                '"$s"';
-            case Symbol(name):
-                // s
-                name;
-            case RawHaxe(code):
-                // #| haxeCode() |#
-                '#| $code |#';
-            case RawHaxeBlock(code):
-                // #{ haxeCode(); moreHaxeCode(); }#
-                '#{ $code }#';
-            case TypedExp(path, exp):
-                // :Type [exp]
-                ':$path ${exp.def.toString()}';
-            case MetaExp(meta, exp):
-                // &meta
-                '&$meta ${exp.def.toString()}';
-            case FieldExp(field, exp, false):
-                '.$field ${exp.def.toString()}';
-            case FieldExp(field, exp, true):
-                '?.$field ${exp.def.toString()}';
-            case KeyValueExp(keyExp, valueExp):
-                '=>${keyExp.def.toString()} ${valueExp.def.toString()}';
-            case Quasiquote(exp):
-                '`${exp.def.toString()}';
-            case Unquote(exp):
-                ',${exp.def.toString()}';
-            case UnquoteList(exp):
-                ',@${exp.def.toString()}';
-            case ListEatingExp(exps):
-                var str = '[::';
-                str += [
-                    for (exp in exps) {
-                        exp.def.toString();
-                    }
-                ].join(" ");
-                str += ']';
-                str;
-            case ListRestExp(name):
-                '...${name}';
-            case None:
-                '';
-            case HaxeMeta(name, null, exp):
-                '@${name} ${exp.def.toString()}';
-            case HaxeMeta(name, params, exp):
-                '@(${name} ${[for (param in params) param.def.toString()].join(" ")}) ${exp.def.toString()}';
-        }
-    }
-}
diff --git a/kiss/src/kiss/ReaderExp.hx b/kiss/src/kiss/ReaderExp.hx
deleted file mode 100644
index 1734ce17..00000000
--- a/kiss/src/kiss/ReaderExp.hx
+++ /dev/null
@@ -1,29 +0,0 @@
-package kiss;
-
-import kiss.Stream;
-
-typedef ReaderExp = {
-    pos:Position,
-    def:ReaderExpDef
-};
-
-enum ReaderExpDef {
-    CallExp(func:ReaderExp, args:Array<ReaderExp>); // (f a1 a2...)
-    ListExp(exps:Array<ReaderExp>); // [v1 v2 v3]
-    StrExp(s:String); // "literal"
-    Symbol(name:String); // s
-    RawHaxe(code:String); // #| haxeCode() |# // deprecated!
-    RawHaxeBlock(code:String); // #{ haxeCode(); moreHaxeCode(); }#
-    TypedExp(path:String, exp:ReaderExp); // :Type <exp>
-    MetaExp(meta:String, exp:ReaderExp); // &meta <exp>
-    FieldExp(field:String, exp:ReaderExp, safeField:Bool); // .field <exp> or ?.field <exp>
-    KeyValueExp(key:ReaderExp, value:ReaderExp); // =>key value
-    Quasiquote(exp:ReaderExp); // `<exp>
-    Unquote(exp:ReaderExp); // ,<exp>
-    UnquoteList(exp:ReaderExp); // ,@<exp>
-    ListEatingExp(exps:Array<ReaderExp>); // [::exp exp ...exps exp]
-    ListRestExp(name:String); // ...<exp> or ...
-    TypeParams(types:Array<ReaderExp>); // <>[T :Constraint U :Constraint1 :Constraint2 V]
-    HaxeMeta(name:String, params:Null<Array<ReaderExp>>, exp:ReaderExp); // @meta <exp> or @(meta <params...>) <exp>
-    None; // not an expression, i.e. (#unless falseCondition exp)
-}
diff --git a/kiss/src/kiss/SpecialForms.hx b/kiss/src/kiss/SpecialForms.hx
deleted file mode 100644
index 927afc30..00000000
--- a/kiss/src/kiss/SpecialForms.hx
+++ /dev/null
@@ -1,670 +0,0 @@
-package kiss;
-
-import haxe.macro.Expr;
-import haxe.macro.Context;
-import kiss.Reader;
-import kiss.ReaderExp;
-import uuid.Uuid;
-import kiss.Kiss;
-
-using uuid.Uuid;
-using kiss.Reader;
-using kiss.Helpers;
-using kiss.Prelude;
-using kiss.Kiss;
-using tink.MacroApi;
-using StringTools;
-import tink.syntaxhub.*;
-
-// Special forms convert Kiss reader expressions into Haxe macro expressions
-typedef SpecialFormFunction = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> Expr;
-
-class SpecialForms {
-    public static function builtins(k:KissState, ?context:FrontendContext) {
-        var map:Map<String, SpecialFormFunction> = [];
-
-        var compileTimeResolveToString = Helpers.compileTimeResolveToString;
-
-        function renameAndDeprecate(oldName:String, newName:String) {
-            var form = map[oldName];
-            map[oldName] = (wholeExp, args, k) -> {
-                KissError.warnFromExp(wholeExp, '$oldName has been renamed to $newName and deprecated');
-                form(wholeExp, args, k);
-            }
-            map[newName] = form;
-            k.formDocs[newName] = k.formDocs[oldName];
-        }
-
-        map["begin"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            // Sometimes empty blocks are useful, so a checkNumArgs() seems unnecessary here for now.
-
-            // blocks can contain field forms that don't return an expression. These can't be included in blocks
-            var exprs = [];
-            for (bodyExp in args) {
-                var expr = k.convert(bodyExp);
-                if (expr != null) {
-                    exprs.push(expr);
-                }
-            }
-            EBlock(exprs).withMacroPosOf(wholeExp);
-        };
-
-        function arrayAccess(wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) {
-            var exp = k.convert(args[0]);
-            for (dimension in 1...args.length) {
-                exp = EArray(exp, k.convert(args[dimension])).withMacroPosOf(wholeExp);
-            }
-            return exp;
-        };
-        k.doc("nth", 2, null, "(nth <list> <idx> <?n-dimensional indices...>)");
-        map["nth"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            arrayAccess(wholeExp, args, k);
-        };
-        k.doc("dictGet", 2, 2, "(dictGet <dict> <key>)");
-        map["dictGet"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            arrayAccess(wholeExp, args, k);
-        };
-
-        function makeQuickNth(idx:Int, name:String) {
-            k.doc(name, 1, 1, '($name <list>)');
-            map[name] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-                EArray(k.convert(args[0]), macro $v{idx}).withMacroPosOf(wholeExp);
-            };
-        }
-        makeQuickNth(0, "first");
-        makeQuickNth(1, "second");
-        makeQuickNth(2, "third");
-        makeQuickNth(3, "fourth");
-        makeQuickNth(4, "fifth");
-        makeQuickNth(5, "sixth");
-        makeQuickNth(6, "seventh");
-        makeQuickNth(7, "eighth");
-        makeQuickNth(8, "ninth");
-        makeQuickNth(9, "tenth");
-        makeQuickNth(-1, "last");
-
-        k.doc("rest", 1, 1, '(rest <list>)');
-        map["rest"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var m = macro ${k.convert(args[0])}.slice(1);
-            wholeExp.expBuilder().haxeExpr(m);
-        };
-
-        // Declare anonymous objects
-        map["object"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            if (args.length % 2 != 0) {
-                throw KissError.fromExp(wholeExp, "(object <field bindings...>) must have an even number of arguments");
-            }
-            EObjectDecl([
-                for (pair in args.groups(2))
-                    {
-                        quotes: Unquoted,
-                        field: switch (pair[0].def) {
-                            case Symbol(name): name;
-                            case TypedExp(_,
-                                {pos: _, def: Symbol(_)}): throw KissError.fromExp(pair[0], "type specification on anonymous objects will be ignored");
-                            default: throw KissError.fromExp(pair[0], "first expression in anonymous object field binding should be a plain symbol");
-                        },
-                        expr: k.convert(pair[1])
-                    }
-            ]).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("new", 1, null, '(new <type> <constructorArgs...>)');
-        map["new"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var classType = switch (args[0].def) {
-                case Symbol(name): name;
-                default: k.convert(args[0]).toString();
-            };
-
-            ENew(Helpers.parseTypePath(classType, args[0]), args.slice(1).map(k.convert)).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("set", 2, 2, "(set <variable> <value>)");
-        map["set"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            // Special case: (set ~var value)
-            var printExp = null;
-            var setVar = switch (args[0].def) {
-                case CallExp({def:Symbol("print" | "Prelude.print" | "trace")}, printArgs):
-                    printExp = args[0];
-                    printArgs[0];
-                default:
-                    args[0];
-            }
-            var setExp = EBinop(OpAssign, k.convert(setVar), k.convert(args[1])).withMacroPosOf(wholeExp);
-            if (printExp != null) {
-                EBlock([k.convert(printExp), setExp]).withMacroPosOf(wholeExp);
-            } else {
-                setExp;
-            }
-        };
-
-        function varName(nameExp:ReaderExp) {
-            return switch (nameExp.def) {
-                case Symbol(name) | TypedExp(_, {pos: _, def: Symbol(name)}):
-                    name;
-                case KeyValueExp(_, valueNameExp):
-                    varName(valueNameExp);
-                default:
-                    throw KissError.fromExp(nameExp, 'expected a symbol, typed symbol, or keyed symbol for variable name in a var binding');
-            };
-        }
-
-        function toVar(nameExp:ReaderExp, valueExp:ReaderExp, k:KissState, ?isFinal:Bool):Var {
-            // This check seems like unnecessary repetition but it's not. It allows is so that individual destructured bindings can specify mutability
-            return if (isFinal == null) {
-                switch (nameExp.def) {
-                    case MetaExp("mut", innerNameExp):
-                        toVar(innerNameExp, valueExp, k, false);
-                    default:
-                        toVar(nameExp, valueExp, k, true);
-                };
-            } else {
-                name: varName(nameExp),
-                type: switch (nameExp.def) {
-                    case TypedExp(type, _):
-                        Helpers.parseComplexType(type, nameExp);
-                    default: null;
-                },
-                isFinal: isFinal && !k.hscript,
-                expr: k.convert(valueExp)
-            };
-        }
-
-        function toVars(namesExp:ReaderExp, valueExp:ReaderExp, k:KissState, ?isFinal:Bool):Array<Var> {
-            return if (isFinal == null) {
-                switch (namesExp.def) {
-                    case MetaExp("mut", innerNamesExp):
-                        toVars(innerNamesExp, valueExp, k, false);
-                    default:
-                        toVars(namesExp, valueExp, k, true);
-                };
-            } else {
-                switch (namesExp.def) {
-                    case Symbol(_) | TypedExp(_, {pos: _, def: Symbol(_)}):
-                        [toVar(namesExp, valueExp, k, isFinal)];
-                    case ListExp(nameExps):
-                        var uniqueVarName = "_" + Uuid.v4().toShort();
-                        var uniqueVarSymbol = Symbol(uniqueVarName).withPosOf(valueExp);
-                        var idx = 0;
-                        // Only evaluate the list expression being destructured once:
-                        [toVar(uniqueVarSymbol, valueExp, k, true)].concat([
-                            for (nameExp in nameExps)
-                                toVar(nameExp, switch (nameExp.def) {
-                                    case KeyValueExp(keyExp, nameExp):
-                                        CallExp(Symbol("dictGet").withPosOf(valueExp), [uniqueVarSymbol, keyExp]).withPosOf(valueExp);
-                                    default:
-                                        CallExp(Symbol("nth").withPosOf(valueExp),
-                                            [uniqueVarSymbol, Symbol(Std.string(idx++)).withPosOf(valueExp)]).withPosOf(valueExp);
-                                }, k, if (isFinal == false) false else null)
-                        ]);
-                    default:
-                        throw KissError.fromExp(namesExp, "Can only bind variables to a symbol or list of symbols for destructuring");
-                };
-            };
-        }
-
-        k.doc("deflocal", 2, 3, "(localVar <optional :type> <variable> <optional: &mut> <value>)");
-        map["deflocal"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            k.localVarCalls.push(wholeExp);
-            k.localVarWarning();
-            EVars(toVars(args[0], args[1], k)).withMacroPosOf(wholeExp);
-        };
-        renameAndDeprecate("deflocal", "localVar");
-
-        k.doc("let", 2, null, "(let [<bindings...>] <body...>)");
-        map["let"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var bindingList = args[0].bindingList("let");
-            var bindingPairs = bindingList.groups(2);
-            var varDefs = [];
-            for (bindingPair in bindingPairs) {
-                varDefs = varDefs.concat(toVars(bindingPair[0], bindingPair[1], k));
-            }
-
-            var body = args.slice(1);
-            if (body.length == 0) {
-                throw KissError.fromArgs(args, '(let....) expression needs a body');
-            }
-
-            for (v in varDefs) {
-                k.addVarInScope(v, true);
-            }
-
-            var block = EBlock([
-                EVars(varDefs).withMacroPosOf(wholeExp),
-                EBlock(body.map(k.convert)).withMacroPosOf(wholeExp)
-            ]).withMacroPosOf(wholeExp);
-
-            for (v in varDefs) {
-                k.removeVarInScope(v, true);
-            }
-
-            block;
-        };
-
-        k.doc("lambda", 2, null, "(lambda [<argsNames...>] <body...>)");
-        map["lambda"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var returnsValue = switch (args[0].def) {
-                case TypedExp("Void", argNames):
-                    args[0] = argNames;
-                    false;
-                default:
-                    true;
-            }
-            EFunction(FAnonymous, Helpers.makeFunction(null, returnsValue, args[0], args.slice(1), k, "lambda", [])).withMacroPosOf(wholeExp);
-        };
-        
-        k.doc("localFunction", 3, null, "(localFunction <optional :Type> <name> [<args...>] <body...>)");
-        map["localFunction"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var name = "";
-            var returnsValue = switch (args[0].def) {
-                case TypedExp("Void", {pos:_, def: Symbol(fname)}):
-                    name = fname;
-                    false;
-                case TypedExp(_, {pos:_, def: Symbol(fname)}):
-                    name = fname;
-                    true;
-                case Symbol(fname):
-                    name = fname;
-                    true;
-                default:
-                    throw KissError.fromExp(wholeExp, "First argument to localFunction must be a function name with an optional return type. To make an anonymous function, use lambda instead.");
-            }
-            EFunction(FNamed(name, false), Helpers.makeFunction(null, returnsValue, args[1], args.slice(2), k, "localFunction", [])).withMacroPosOf(wholeExp);
-        };
-    
-        function forExpr(formName:String, wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) {
-            var uniqueVarName = "_" + Uuid.v4().toShort();
-            var namesExp = args[0];
-            var listExp = args[1];
-            var bodyExps = args.slice(2);
-            
-            var b = wholeExp.expBuilder();
-            var m = macro $i{uniqueVarName};
-
-            var innerLet = false;
-            var varsInScope = [];
-            var loopVarExpr:Expr = switch (namesExp.def) {
-                case KeyValueExp({pos: _, def: Symbol(s1)}, {pos: _, def: Symbol(s2)}): 
-                    varsInScope.push({name:s1});
-                    varsInScope.push({name:s2});
-                    k.convert(namesExp);
-                case Symbol(s): 
-                    varsInScope.push({name:s});
-                    k.convert(namesExp);
-                case ListExp(_) | TypedExp(_, {pos:_, def:Symbol(_)}): 
-                    innerLet = true;
-                    b.haxeExpr(m);
-                default:
-                    throw KissError.fromExp(namesExp, 'invalid pattern in `$formName`');
-            };
-
-
-            var body = if (innerLet) {
-                b.let([namesExp, b.symbol(uniqueVarName)], bodyExps);
-            } else {
-                b.begin(bodyExps);
-            };
-
-            for (v in varsInScope) {
-                k.addVarInScope(v, true, false);
-            }
-            var body = k.convert(body);
-            for (v in varsInScope) {
-                k.removeVarInScope(v, true);
-            }
-
-            return EFor(EBinop(OpIn, loopVarExpr, k.convert(listExp)).withMacroPosOf(wholeExp), body).withMacroPosOf(wholeExp);
-        }
-
-        k.doc("doFor", 3, null, '(doFor <var> <iterable> <body...>)');
-        k.doc("for", 3, null, '(for <var> <iterable> <body...>)');
-        map["doFor"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            EBlock([forExpr("doFor", wholeExp, args, k), k.convert(wholeExp.expBuilder().symbol("null"))]).withMacroPosOf(wholeExp);
-        };
-        map["for"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            EArrayDecl([forExpr("for", wholeExp, args, k)]).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("loop", 1, null, '(loop <body...>)');
-        map["loop"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            EWhile(macro true, k.convert(wholeExp.expBuilder().begin(args)), true).withMacroPosOf(wholeExp);
-        };
-
-        
-        function whileForm(invert:Bool, wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) {
-            var funcName = if (invert) "until" else "while";
-            var b = wholeExp.expBuilder();
-            var cond = k.convert(b.callSymbol("Prelude.truthy", [args[0]]));
-            if (invert) {
-                cond = macro !$cond;
-                cond = b.haxeExpr(cond);
-            }
-            return EWhile(cond, k.convert(b.begin(args)), true).withMacroPosOf(wholeExp);
-        }
-
-        k.doc("while", 2, null, '(while <condition> <body...>)');
-        map["while"] = whileForm.bind(false);
-        k.doc("until", 2, null, '(until <condition> <body...>)');
-        map["until"] = whileForm.bind(true);
-
-        k.doc("return", 0, 1, '(return <?value>)');
-        map["return"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {    
-            var returnExpr = if (args.length == 1) k.convert(args[0]) else null;
-            EReturn(returnExpr).withMacroPosOf(wholeExp);
-        };
-        
-        k.doc("break", 0, 0, "(break)");
-        map["break"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {   
-            EBreak.withMacroPosOf(wholeExp);
-        };
-
-        k.doc("continue", 0, 0, "(continue)");
-        map["continue"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            EContinue.withMacroPosOf(wholeExp);
-        };
-
-        // (case... ) for switch
-        k.doc("case", 2, null, '(case <expression> <cases...> <optional: (otherwise <default>)>)');
-        map["case"] = (wholeExp:ReaderExp, args:kiss.List<ReaderExp>, k:KissState) -> {
-            // Most Lisps don't enforce covering all possible patterns with (case...), but Kiss does,
-            // because pattern coverage is a useful feature of Haxe that Kiss can easily bring along.
-            // To be more similar to other Lisps, Kiss *could* generate a default case that returns null
-            // if no "otherwise" clause is given.
-
-            // Therefore only one case is required in a case statement, because one case could be enough
-            // to cover all patterns.
-            var args:kiss.List<ReaderExp> = args.copy();
-
-            var cases:kiss.List<ReaderExp> = [for (c in args.slice(1)) {
-                c.expBuilder().neverCase();
-            }];
-            
-            Helpers.checkNoEarlyOtherwise(cases);
-
-            var isTupleCase = switch (args[0].def) {
-                case ListExp(_):
-                    true;
-                default:
-                    false;
-            }
-
-            if (k.hscript && isTupleCase) {
-                throw KissError.fromExp(wholeExp, "tuple-matching is not supported in a macro");
-            }
-
-            var b = wholeExp.expBuilder();
-            var defaultExpr = switch (cases[-1].def) {
-                case CallExp({pos: _, def: Symbol("otherwise")}, otherwiseExps):
-                    cases.pop();
-                    k.convert(b.begin(otherwiseExps));
-                default:
-                    null;
-            };
-
-            var exp = k.withoutListWrapping().convert(args[0]);
-
-            var canCompareNull = !isTupleCase;
-
-            
-            // case also override's haxe's switch() behavior by refusing to match null values against <var> patterns.
-            if (canCompareNull) {
-                var nullExpr = defaultExpr;
-                var idx = 0;
-                for (arg in cases) {
-                    switch (arg.def) {
-                        case CallExp({pos: _, def: Symbol("null")}, nullExps):
-                            cases.splice(idx, 1);
-                            nullExpr = k.convert(b.begin(nullExps));
-                            break;
-                        default:
-                    }
-                    ++idx;
-                }
-
-                if (nullExpr == null) {
-                    throw KissError.fromExp(wholeExp, "Unmatched pattern: null");
-                }
-
-                var nullCase = if (k.hscript) {
-                    b.callSymbol("null", [b.raw(nullExpr.toString())]);  
-                } else {
-                    var gensym = b.symbol();
-                    b.call(b.callSymbol("when", [b.callSymbol("Prelude.isNull", [gensym]), gensym]), [b.raw(nullExpr.toString())]);
-                };
-
-                cases.insert(0, nullCase);
-            }
-
-            ESwitch(exp, cases.map(Helpers.makeSwitchCase.bind(_, k)), defaultExpr).withMacroPosOf(wholeExp);
-        };
-
-        // Type check syntax:
-        k.doc("the", 2, 3, '(the <?package> <type> <value>)');
-        map["the"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var pkg = "";
-            var whichArg = "first";
-            if (args.length == 3) {
-                pkg = switch (args.shift().def) {
-                    case Symbol(pkg): pkg;
-                    default: throw KissError.fromExp(wholeExp, '$whichArg argument to (the... ) should be a valid haxe package');
-                };
-                whichArg = "second";
-            }
-            var type = switch (args[0].def) {
-                case Symbol(type): type;
-                default: throw KissError.fromExp(wholeExp, '$whichArg argument to (the... ) should be a valid type');
-            };
-            if (pkg.length > 0)
-                type = pkg + "." + type;
-            ECheckType(k.convert(args[1]), Helpers.parseComplexType(type, wholeExp, !type.contains("<"))).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("try", 1, null, "(try <thing> <catches...>)");
-        map["try"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var tryKissExp = args[0];
-            var catchKissExps = args.slice(1);
-            ETry(k.convert(tryKissExp), [
-                for (catchKissExp in catchKissExps) {
-                    switch (catchKissExp.def) {
-                        case CallExp({pos: _, def: Symbol("catch")}, catchArgs):
-                            {
-                                name: switch (catchArgs[0].def) {
-                                    case ListExp([
-                                        {
-                                            pos: _,
-                                            def: Symbol(name) | TypedExp(_, {pos: _, def: Symbol(name)})
-                                        }
-                                    ]): name;
-                                    default: throw KissError.fromExp(catchKissExp, 'first argument to (catch... ) should be a one-element argument list');
-                                },
-                                type: switch (catchArgs[0].def) {
-                                    case ListExp([{pos: _, def: TypedExp(type, _)}]):
-                                        Helpers.parseComplexType(type, catchArgs[0]);
-                                    default: null;
-                                },
-                                expr: k.convert(CallExp(Symbol("begin").withPos(catchArgs[1].pos), catchArgs.slice(1)).withPos(catchArgs[1].pos))
-                            };
-                        default:
-                            throw KissError.fromExp(catchKissExp,
-                                'expressions following the first expression in a (try... ) should all be (catch [[error]] [body...]) expressions');
-                    }
-                }
-            ]).withMacroPosOf(wholeExp);
-        };
-
-        map["throw"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            if (args.length != 1) {
-                throw KissError.fromExp(wholeExp, 'throw expression should only throw one value');
-            }
-            EThrow(k.convert(args[0])).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("if", 2, 3, '(if <cond> <then> <?else>)');
-        map["if"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var condition = macro Prelude.truthy(${k.convert(args[0])});
-            var thenExp = k.convert(args[1]);
-            var elseExp = if (args.length > 2) {
-                k.convert(args[2]);
-            } else {
-                // Kiss (if... ) expressions all need to generate a Haxe else block
-                // to make sure they always return something
-                k.convert(b.symbol("null"));
-            };
-
-            // TODO these macro forms cause the compiler errors to give line numbers
-            // pointing back to SpecialForms.hx, which aren't helpful. withMacroPosOf should be used
-            // to wrap them
-            var m = macro if ($condition)
-                $thenExp
-            else
-                $elseExp;
-
-            b.haxeExpr(m);
-        };
-
-        k.doc("not", 1, 1, '(not <value>)');
-        map["not"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var condition = k.convert(args[0]);
-            var truthyExp = macro Prelude.truthy($condition);
-            var m = macro !$truthyExp;
-            b.haxeExpr(m);
-        };
-
-        k.doc("cast", 1, 2, '(cast <value> <optional type>)');
-        map["cast"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
-            var e = k.convert(args[0]);
-            var t = null;
-            if (args.length > 1) {
-                switch (args[1].def) {
-                    case Symbol(typePath):
-                        t = Helpers.parseComplexType(typePath, wholeExp, !typePath.contains("<"));
-                    default:
-                        throw KissError.fromExp(wholeExp, 'second argument to cast should be a type path symbol');
-                }
-            }
-            ECast(e, t).withMacroPosOf(wholeExp);
-        }
-
-        k.doc("trace", 1, 2, "(trace <value> <?label>)");
-        map["trace"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var label = if (exps.length > 1) exps[1] else b.str("");
-            var label = k.convert(label);
-            var m = macro kiss.Prelude.withLabel(v, $label);
-            EBlock([
-                EVars([
-                    toVar(b.symbol("v"), exps[0], k)
-                ]).withMacroPosOf(wholeExp),
-                ECall(EConst(CIdent("trace")).withMacroPosOf(wholeExp), [
-                    b.haxeExpr(m)
-                ]).withMacroPosOf(wholeExp),
-                k.convert(exps[0])
-            ]).withMacroPosOf(wholeExp);
-        };
-
-        k.doc("macroPrint", 1, 1, "(macroPrint <exp...>)");
-        // At compile-time, print the macro expansion and generated haxe code of the given expression,
-        // Then at runtime, evaluate the expression normally.
-        map["macroPrint"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            var b = wholeExp.expBuilder();
-            var expansion = Kiss.macroExpand(exps[0], k);
-            Helpers.printExp(expansion);
-
-            var e = Kiss.convert(k, expansion);
-            Prelude.printStr(e.toString());
-            return e;
-        };
-
-        function requireContext(exp, formName) {
-            if (context == null) {
-                throw KissError.fromExp(exp, '$formName cannot be used when calling Kiss as a build macro in a Haxe file.');
-            }
-        }
-
-        function none(exp) {
-            return EBlock([]).withMacroPosOf(exp);
-        }
-
-		k.doc("import", 1, null, "(import <types...>)");
-        map["import"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "import");
-            for (type in exps) {
-                context.addImport(Reader.toString(type.def), INormal, wholeExp.macroPos());
-            }
-            return none(wholeExp);
-        };
-
-        k.doc("importAs", 2, 2, "(importAs <Type> <Alias>)");
-        map["importAs"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "importAs");
-            context.addImport(Reader.toString(exps[0].def), IAsName(Reader.toString(exps[1].def)), wholeExp.macroPos());
-            return none(wholeExp);
-        };
-
-        k.doc("importAll", 1, 1, "(importAll <package>)");
-        map["importAll"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "importAll");
-            context.addImport(Reader.toString(exps[0].def), IAll, wholeExp.macroPos());
-            return none(wholeExp);
-        };
-        
-        k.doc("using", 1, null, "(using <Types...>)");
-        map["using"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "using");
-            for (type in exps) {
-                context.addUsing(Reader.toString(type.def), wholeExp.macroPos());
-            }
-            return none(wholeExp);
-        };
-
-        k.doc("extends", 1, 1, "(extends <Class>)");
-        map["extends"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "extends");
-            var type = context.getType();
-            type.kind = switch (type.kind) {
-                case TDClass(null, interfaces, false, false, false):
-                    TDClass(Reader.toString(exps[0].def).asTypePath(), interfaces, false, false, false);
-                default:
-                    throw KissError.fromExp(wholeExp, '${type.name} must be a class without a superclass');
-            }
-            return none(wholeExp);
-        };
-
-        k.doc("implements", 1, null, "(implements <Interfaces...>)");
-        map["implements"] = (wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) -> {
-            requireContext(wholeExp, "implements");
-            var type = context.getType();
-            var interfaces = [for (exp in exps) Reader.toString(exp.def).asTypePath()];
-            type.kind = switch (type.kind) {
-                case TDClass(superClass, [], false, false, false):
-                    TDClass(superClass, interfaces, false, false, false);
-                default:
-                    throw KissError.fromExp(wholeExp, '${type.name} must be a class without any interfaces');
-            }
-            return none(wholeExp);
-        };
-
-        return map;
-    }
-    
-    public static function caseOr(wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState):Expr {
-        wholeExp.checkNumArgs(2, null, "(or <pattern1> <pattern2> <patterns...>)");
-        var b = wholeExp.expBuilder();
-        return if (args.length == 2) {
-            var m = macro ${k.convert(args[0])} | ${k.convert(args[1])};
-            b.haxeExpr(m);
-        } else {
-            var m = macro ${k.convert(args[0])} | ${caseOr(wholeExp, args.slice(1), k)};
-            b.haxeExpr(m);
-        };
-    };
-
-    public static function caseAs(wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState):Expr {
-        wholeExp.checkNumArgs(2, 2, "(as <name> <pattern>)");
-        var b = wholeExp.expBuilder();
-        var m = macro ${k.convert(args[0])} = ${k.convert(args[1])};
-        return b.haxeExpr(m);
-    };
-}
diff --git a/kiss/src/kiss/Stream.hx b/kiss/src/kiss/Stream.hx
deleted file mode 100644
index 8b67021e..00000000
--- a/kiss/src/kiss/Stream.hx
+++ /dev/null
@@ -1,312 +0,0 @@
-package kiss;
-
-#if (sys || hxnodejs)
-import sys.io.File;
-#end
-import haxe.ds.Option;
-
-using StringTools;
-using Lambda;
-using kiss.Stream;
-
-typedef Position = {
-    file:String,
-    line:Int,
-    column:Int,
-    absoluteChar:Int
-};
-
-class StreamError {
-    var position:Position;
-    var message:String;
-
-    public function new(position:Position, message:String) {
-        this.position = position;
-        this.message = message;
-    }
-
-    public function toString() {
-        return '\nKiss reader error!\n'
-            + position.toPrint()
-            + ': $message\n';
-    }
-}
-
-class Stream {
-    public var content(default, null):String;
-
-    var file:String;
-    var line:Int;
-    var column:Int;
-    var absoluteChar:Int;
-
-    var absolutePerNewline = 1;
-
-    public var startOfLine = true;
-
-    #if (sys || hxnodejs)
-    public static function fromFile(file:String) {
-        return new Stream(file, File.getContent(file));
-    }
-    #end
-
-    public static function fromString(content:String, position:Position = null) {
-        var file = "string";
-        if (position != null) {
-            file = position.file;
-        } 
-        var s = new Stream(file, content);
-        if (position != null) {
-            s.line = position.line;
-            s.column = position.column;
-            s.absoluteChar = position.absoluteChar;
-        }
-        return s;
-    }
-
-    private function new(file:String, content:String) {
-        this.file = file.replace('\\', '/');
-
-        // Banish ye Windows line-endings
-        if (content.indexOf('\r') >= 0) {
-            absolutePerNewline = 2;
-            content = content.replace('\r', '');
-        }
-
-        // Life is easier with a trailing newline
-        if (content.charAt(content.length - 1) != "\n")
-            content += "\n";
-
-        this.content = content;
-
-        line = 1;
-        column = 1;
-        absoluteChar = 0;
-    }
-
-    public function peekChars(chars:Int):Option<String> {
-        if (content.length < chars)
-            return None;
-        return Some(content.substr(0, chars));
-    }
-
-    public function isEmpty() {
-        return content.length == 0;
-    }
-
-    public function position():Position {
-        return {
-            file: file,
-            line: line,
-            column: column,
-            absoluteChar: absoluteChar
-        };
-    }
-
-    public static function toPrint(p:Position) {
-        return '${p.file}:${p.line}:${p.column}';
-    }
-
-    public function startsWith(s:String) {
-        return switch (peekChars(s.length)) {
-            case Some(s1) if (s == s1): true;
-            default: false;
-        };
-    }
-
-    var lineLengths = [];
-
-    /** Every drop call should end up calling dropChars() or the position tracker will be wrong. **/
-    public function dropChars(count:Int) {
-        for (idx in 0...count) {
-            switch (content.charAt(idx)) {
-                case "\n":
-                    absoluteChar += absolutePerNewline;
-                    line += 1;
-                    lineLengths.push(column);
-                    column = 1;
-                    startOfLine = true;
-                case c if (c.trim() == ""):
-                    absoluteChar += 1;
-                    column += 1;
-                default:
-                    absoluteChar += 1;
-                    column += 1;
-                    startOfLine = false;
-            }
-        }
-        content = content.substr(count);
-    }
-
-    public function putBackString(s:String) {
-        #if macro
-        Kiss.measure("Stream.putBackString", () -> {
-        #end
-            var idx = s.length - 1;
-            while (idx >= 0) {
-                absoluteChar -= 1;
-                switch (s.charAt(idx)) {
-                    case "\n":
-                        line -= 1;
-                        column = lineLengths.pop();
-                    default:
-                        column -= 1;
-                }
-                --idx;
-            }
-            content = s + content;
-        #if macro
-        }, true);
-        #end
-    }
-
-    public function takeChars(count:Int):Option<String> {
-        if (count > content.length)
-            return None;
-        var toReturn = content.substr(0, count);
-        dropChars(count);
-        return Some(toReturn);
-    }
-
-    public function dropString(s:String) {
-        var toDrop = content.substr(0, s.length);
-        if (toDrop != s) {
-            error(this, 'Expected $s');
-        }
-        dropChars(s.length);
-    }
-
-    public function dropStringIf(s:String):Bool {
-        var toDrop = content.substr(0, s.length);
-        if (toDrop == s) {
-            dropString(toDrop);
-            return true;
-        }
-        return false;
-    }
-
-    public function dropUntil(s:String) {
-        dropChars(content.indexOf(s));
-    }
-
-    public function dropWhitespace() {
-        var trimmed = content.ltrim();
-        dropChars(content.length - trimmed.length);
-    }
-
-    public function takeUntilOneOf(terminators:Array<String>, allowEOF:Bool = false):Option<String> {
-        var indices = [for (term in terminators) content.indexOf(term)].filter((idx) -> idx >= 0);
-        if (indices.length == 0) {
-            return if (allowEOF) {
-                Some(takeRest());
-            } else {
-                None;
-            }
-        }
-        var firstIndex = Math.floor(indices.fold(Math.min, indices[0]));
-        return takeChars(firstIndex);
-    }
-
-    public function takeUntil(s:String, allowEOF:Bool = false):Option<String> {
-        return takeUntilOneOf([s], allowEOF);
-    }
-
-    public function takeUntilAndDrop(s:String, allowEOF:Bool = false):Option<String> {
-        var idx = content.indexOf(s);
-
-        if (idx < 0) {
-            return if (allowEOF) {
-                Some(takeRest());
-            } else {
-                None;
-            }
-        }
-
-        var toReturn = content.substr(0, idx);
-        dropChars(toReturn.length + s.length);
-        return Some(toReturn);
-    }
-
-    // If the stream starts with the opening delimiter, return the text between it and the closing delimiter.
-    // Allow either delimiter to appear immediately after escapeSeq,
-    // otherwise throw if open occurs again before close, and end on finding close
-    public function takeBetween(open:String, close:String, ?escapeSeq:String):Option<String> {
-        if (!startsWith(open)) return None;
-        dropString(open);
-        var taken = "";
-        while (true) {
-            if (startsWith(close)) {
-                dropString(close);
-                return Some(taken);
-            } else if (startsWith(open)) {
-                error(this, "takeBetween() does not support nested delimiter pairs");
-            } else if (escapeSeq != null && startsWith(escapeSeq)) {
-                dropString(escapeSeq);
-                if (startsWith(open)) {
-                    dropString(open);
-                    taken += open;
-                } else if (startsWith(close)) {
-                    dropString(close);
-                    taken += close;
-                } else if (startsWith(escapeSeq)) {
-                    dropString(escapeSeq);
-                    taken += escapeSeq;
-                } else {
-                    error(this, 'invalid escape sequence');
-                }
-            } else {
-                var next = switch (takeChars(1)) {
-                    case Some(n): n;
-                    default: error(this, 'Ran out of characters before closing delimiter $close'); "";
-                }
-                taken += next;
-            }
-        }
-    }
-
-    public function takeRest():String {
-        var toReturn = content;
-        dropChars(content.length);
-        return toReturn;
-    }
-
-    public function takeLine():Option<String> {
-        return switch (takeUntilAndDrop("\n")) {
-            case Some(line): Some(line);
-            case None if (content.length > 0): Some(takeRest());
-            default: None;
-        };
-    }
-
-    public function takeLineAsStream():Option<Stream> {
-        var lineNo = this.line;
-        var column = this.column;
-        var absoluteChar = this.absoluteChar;
-        return switch (takeLine()) {
-            case Some(line): Some({
-                var s = Stream.fromString(line);
-                s.line = lineNo;
-                s.column = column;
-                s.file = this.file;
-                s.absoluteChar = absoluteChar;
-                s;
-            });
-            default: None;
-        };
-    }
-
-    public function expect(whatToExpect:String, f:Void->Option<String>):String {
-        var position = position();
-        switch (f()) {
-            case Some(s):
-                return s;
-            default:
-                error(this, 'Expected $whatToExpect');
-                return null;
-        }
-    }
-
-    public static function error(stream:Stream, message:String) {
-        throw new StreamError(stream.position(), message);
-    }
-}
diff --git a/kiss/src/kiss/cloner/Cloner.hx b/kiss/src/kiss/cloner/Cloner.hx
deleted file mode 100644
index c1c19e64..00000000
--- a/kiss/src/kiss/cloner/Cloner.hx
+++ /dev/null
@@ -1,120 +0,0 @@
-package kiss.cloner;
-
-import Array;
-import haxe.ds.ObjectMap;
-import Type.ValueType;
-import haxe.ds.IntMap;
-import haxe.ds.StringMap;
-
-class Cloner {
-    var cache:ObjectMap<Dynamic, Dynamic>;
-    var classHandles:Map<String, Dynamic->Dynamic>;
-    var stringMapCloner:MapCloner<String>;
-    var intMapCloner:MapCloner<Int>;
-
-    public function new():Void {
-        stringMapCloner = new MapCloner(this, StringMap);
-        intMapCloner = new MapCloner(this, IntMap);
-        classHandles = new Map<String, Dynamic->Dynamic>();
-        classHandles.set('String', returnString);
-        classHandles.set('Array', cloneArray);
-        classHandles.set('haxe.ds.StringMap', stringMapCloner.clone);
-        classHandles.set('haxe.ds.IntMap', intMapCloner.clone);
-    }
-
-    function returnString(v:String):String {
-        return v;
-    }
-
-    public function clone<T>(v:T):T {
-        cache = new ObjectMap<Dynamic, Dynamic>();
-        var outcome:T = _clone(v);
-        cache = null;
-        return outcome;
-    }
-
-    public function _clone<T>(v:T):T {
-        #if js
-        if (Std.is(v, String))
-            return v;
-        #end
-
-        #if (neko || cs)
-        try {
-            if (Type.getClassName(cast v) != null)
-                return v;
-        } catch (e:Dynamic) {}
-        #else
-        if (Type.getClassName(cast v) != null)
-            return v;
-        #end
-        switch (Type.typeof(v)) {
-            case TNull:
-                return null;
-            case TInt:
-                return v;
-            case TFloat:
-                return v;
-            case TBool:
-                return v;
-            case TObject:
-                return handleAnonymous(v);
-            case TFunction:
-                return v;
-            case TClass(c):
-                if (!cache.exists(v))
-                    cache.set(v, handleClass(c, v));
-                return cache.get(v);
-            case TEnum(e):
-                return v;
-            case TUnknown:
-                throw 'Cannot clone object of unknown type $v';
-        }
-    }
-
-    function handleAnonymous(v:Dynamic):Dynamic {
-        var properties:Array<String> = Reflect.fields(v);
-        var anonymous:Dynamic = {};
-        for (i in 0...properties.length) {
-            var property:String = properties[i];
-            Reflect.setField(anonymous, property, _clone(Reflect.getProperty(v, property)));
-        }
-        return anonymous;
-    }
-
-    function handleClass<T>(c:Class<T>, inValue:T):T {
-        var handle:T->T = classHandles.get(Type.getClassName(c));
-        if (handle == null)
-            handle = cloneClass;
-        return handle(inValue);
-    }
-
-    function cloneArray<T>(inValue:Array<T>):Array<T> {
-        var array:Array<T> = inValue.copy();
-        for (i in 0...array.length)
-            array[i] = _clone(array[i]);
-        return array;
-    }
-
-    function cloneClass<T>(inValue:T):T {
-        var classValue = Type.getClass(inValue);
-        var outValue:T = Type.createEmptyInstance(classValue);
-        var fields:Array<String> = Type.getInstanceFields(classValue);
-        for (field in fields) {
-            var property = Reflect.getProperty(inValue, field);
-            try {
-                Reflect.setField(outValue, field, _clone(property));
-            } catch (s) {
-                // There will be errors on C++ and C# when trying to assign to a member function.
-                // They're not important, because the function will already be on the clone.
-                // However, some types won't clone properly on C#, and if that becomes a problem, tests should fail
-                #if cs
-                if (field != "breakPoints" && Std.string(s) == "Specified cast is not valid.") {
-                    throw 'Failed to clone field $field on $inValue';
-                }
-                #end
-            }
-        }
-        return outValue;
-    }
-}
diff --git a/kiss/src/kiss/cloner/LICENSE.md b/kiss/src/kiss/cloner/LICENSE.md
deleted file mode 100644
index feaaa852..00000000
--- a/kiss/src/kiss/cloner/LICENSE.md
+++ /dev/null
@@ -1,24 +0,0 @@
-License
-=======
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Thomas Uster
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/kiss/src/kiss/cloner/MapCloner.hx b/kiss/src/kiss/cloner/MapCloner.hx
deleted file mode 100644
index 07213197..00000000
--- a/kiss/src/kiss/cloner/MapCloner.hx
+++ /dev/null
@@ -1,26 +0,0 @@
-package kiss.cloner;
-
-import haxe.Constraints.IMap;
-import kiss.cloner.Cloner;
-import Type.ValueType;
-
-class MapCloner<K> {
-    var cloner:Cloner;
-    var type:Class<IMap<K, Dynamic>>;
-    var noArgs:Array<Dynamic>;
-
-    public function new(cloner:Cloner, type:Class<IMap<K, Dynamic>>):Void {
-        this.cloner = cloner;
-        this.type = type;
-        noArgs = [];
-    }
-
-    public function clone<K, Dynamic>(inValue:IMap<K, Dynamic>):IMap<K, Dynamic> {
-        var inMap:IMap<K, Dynamic> = inValue;
-        var map:IMap<K, Dynamic> = cast Type.createInstance(type, noArgs);
-        for (key in inMap.keys()) {
-            map.set(key, cloner._clone(inMap.get(key)));
-        }
-        return map;
-    }
-}
diff --git a/kiss/src/kiss/cloner/README.md b/kiss/src/kiss/cloner/README.md
deleted file mode 100644
index 4bfbcf56..00000000
--- a/kiss/src/kiss/cloner/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](LICENSE.md)
-[![TravisCI Build Status](https://travis-ci.org/thomasuster/cloner.svg?branch=master)](https://travis-ci.org/thomasuster/cloner)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/thomasuster/cloner?branch=master&svg=true)](https://ci.appveyor.com/project/thomasuster/cloner)
-
-```
-git clone https://github.com/thomasuster/cloner.git
-haxelib dev cloner cloner/src
-```
-```
-var cloner:Cloner = new Cloner();
-var clone = cloner.clone(mostAnything);
-```
\ No newline at end of file
diff --git a/kiss/src/test/BasicInterface.hx b/kiss/src/test/BasicInterface.hx
deleted file mode 100644
index 0684fdbd..00000000
--- a/kiss/src/test/BasicInterface.hx
+++ /dev/null
@@ -1,5 +0,0 @@
-package test;
-
-interface BasicInterface {
-    public var otherNum(default,null):Int;
-}
\ No newline at end of file
diff --git a/kiss/src/test/OtherPureKissClass.kiss b/kiss/src/test/OtherPureKissClass.kiss
deleted file mode 100644
index aca82f25..00000000
--- a/kiss/src/test/OtherPureKissClass.kiss
+++ /dev/null
@@ -1,3 +0,0 @@
-(function extensionMethod [:String s] "EXTENDED")
-
-(defNew [&prop :Int num])
\ No newline at end of file
diff --git a/kiss/src/test/PureKissClass.kiss b/kiss/src/test/PureKissClass.kiss
deleted file mode 100644
index fa905de2..00000000
--- a/kiss/src/test/PureKissClass.kiss
+++ /dev/null
@@ -1,17 +0,0 @@
-(import test.OtherPureKissClass)
-(importAs test.OtherPureKissClass Alias)
-(using test.OtherPureKissClass)
-
-(extends OtherPureKissClass)
-(implements test.BasicInterface)
-
-(defNew [num &prop :Int otherNum]
-    (super num))
-
-(function test []
-    (assert (= (.extensionMethod "string") "EXTENDED"))
-    (let [instance (new OtherPureKissClass 5)
-            other (new Alias 5)
-            third (new PureKissClass 5 6)]
-        (assert (= instance.num other.num third.num 5))
-        (assert (= third.otherNum 6))))
\ No newline at end of file
diff --git a/kiss/src/test/TestMain.hx b/kiss/src/test/TestMain.hx
deleted file mode 100644
index 280f90be..00000000
--- a/kiss/src/test/TestMain.hx
+++ /dev/null
@@ -1,33 +0,0 @@
-package test;
-
-import utest.Runner;
-import utest.ui.Report;
-#if macro
-import haxe.macro.Context;
-#end
-
-class TestMain {
-    public static function main() {
-        var runner = new Runner();
-        addCases();
-        Report.create(runner);
-        runner.run();
-    }
-
-    static macro function addCases() {
-        if (Context.defined("cases")) {
-            var cases = Context.definedValue("cases").split(",");
-            var block = [];
-            for (caseName in cases) {
-                var typePath = {
-                    pack: ["test", "cases"],
-                    name: caseName
-                };
-                block.push(macro runner.addCase(new $typePath()));
-            }
-            return macro $b{block};
-        } else {
-            return macro runner.addCases(test.cases);
-        }
-    }
-}
diff --git a/kiss/src/test/cases/AwaitLetTestCase.hx b/kiss/src/test/cases/AwaitLetTestCase.hx
deleted file mode 100644
index c347261d..00000000
--- a/kiss/src/test/cases/AwaitLetTestCase.hx
+++ /dev/null
@@ -1,20 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.Prelude;
-#if js
-import js.lib.Promise;
-#end
-import utest.Async;
-
-@:build(kiss.Kiss.build())
-class AwaitLetTestCase extends Test {
-    function testMultipleBindings(async:Async) {
-        _testMultipleBindings(async);
-    }
-
-    function testRejectedPromise(async:Async) {
-        _testRejectedPromise(async);
-    }
-}
\ No newline at end of file
diff --git a/kiss/src/test/cases/AwaitLetTestCase.kiss b/kiss/src/test/cases/AwaitLetTestCase.kiss
deleted file mode 100644
index 3237b33c..00000000
--- a/kiss/src/test/cases/AwaitLetTestCase.kiss
+++ /dev/null
@@ -1,28 +0,0 @@
-(function _testMultipleBindings [:Async async]
-    (#if js
-            {
-                (awaitLet [a (Promise.resolve 1)
-                            b (Promise.resolve 2)
-                            c (Promise.resolve 3)]
-                    (Assert.equals 6 (+ a b c))
-                    (async.done))
-            }
-        {
-            (Assert.pass)
-            (async.done)
-        }))
-
-(function _testRejectedPromise [:Async async]
-    (#if js
-            {
-                (awaitLet [result (Promise.reject "async error")]
-                        (catch [reason]
-                            (Assert.pass)
-                            (async.done))
-                    (Assert.fail)
-                    (async.done))
-            }
-        {
-            (Assert.pass)
-            (async.done)
-        }))
\ No newline at end of file
diff --git a/kiss/src/test/cases/BasicTestCase.hx b/kiss/src/test/cases/BasicTestCase.hx
deleted file mode 100644
index 3b258f87..00000000
--- a/kiss/src/test/cases/BasicTestCase.hx
+++ /dev/null
@@ -1,463 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.Prelude;
-import kiss.List;
-import kiss.Stream;
-import haxe.ds.Option;
-import kiss.Kiss;
-#if js
-import js.lib.Promise;
-#end
-
-using StringTools;
-
-@:build(kiss.Kiss.build())
-class BasicTestCase extends Test {
-    function testStaticVar() {
-        Assert.equals("Howdy", BasicTestCase.message);
-    }
-
-    function testHaxeInsertion() {
-        _testHaxeInsertion();
-    }
-
-    function testKissInsertion() {
-        Assert.equals(10, Kiss.exp('(+ 5 2 3)'));
-    }
-
-    function testStaticFunction() {
-        Assert.equals(6, BasicTestCase.myFloor(6.5));
-    }
-
-    function testFuncall() {
-        Assert.equals(7, BasicTestCase.funResult);
-    }
-
-    function testField() {
-        Assert.equals(5, new BasicTestCase().myField);
-    }
-
-    function testMethod() {
-        Assert.equals(5, new BasicTestCase().myMethod());
-    }
-
-    function testArray() {
-        var arr = BasicTestCase.myArray;
-        Assert.equals(3, arr.length);
-        Assert.equals(1, arr[0]);
-        Assert.equals(2, arr[1]);
-        Assert.equals(3, arr[2]);
-
-        // Kiss arrays can be negatively indexed like Python
-        Assert.equals(3, arr[-1]);
-        Assert.equals(2, arr[-2]);
-        Assert.equals(1, arr[-3]);
-    }
-
-    function testArrayAccess() {
-        Assert.equals(3, BasicTestCase.myArrayLast);
-    }
-
-    function testCollect() {
-        _testCollect();
-    }
-
-    function testConcat() {
-        _testConcat();
-    }
-
-    function testVariadicAdd() {
-        Assert.equals(6, BasicTestCase.mySum);
-    }
-
-    function testVariadicSubtract() {
-        Assert.equals(-2, BasicTestCase.myDifference);
-    }
-
-    function testVariadicMultiply() {
-        _testMultiplication();
-    }
-
-    function testVariadicDivide() {
-        Assert.equals(0.5, BasicTestCase.myQuotient);
-    }
-
-    function testMod() {
-        Assert.equals(4, BasicTestCase.myRemainder);
-    }
-
-    function testPow() {
-        Assert.equals(256, BasicTestCase.myPower);
-    }
-
-    function testUnop() {
-        Assert.equals(7, BasicTestCase.myInc);
-        Assert.equals(7, BasicTestCase.myNum);
-    }
-
-    function testMin() {
-        Assert.equals(1, BasicTestCase.myMin);
-    }
-
-    function testMax() {
-        Assert.equals(9, BasicTestCase.myMax);
-    }
-
-    function testLessThan() {
-        _testLessThan();
-    }
-
-    function testLesserEqual() {
-        _testLesserEqual();
-    }
-
-    function testGreaterThan() {
-        _testGreaterThan();
-    }
-
-    function testGreaterEqual() {
-        _testGreaterEqual();
-    }
-
-    function testEqual() {
-        _testEqual();
-    }
-
-    function testIf() {
-        _testIf();
-    }
-
-    // TODO to really test typed variable definitions, check for compilation failure on a bad example
-    function testTypedDefvar() {
-        Assert.equals(8, BasicTestCase.myInt);
-    }
-
-    function testTryCatch() {
-        Assert.equals(5, BasicTestCase.myTryCatch("string error"));
-        Assert.equals(6, BasicTestCase.myTryCatch(404));
-        Assert.equals(7, BasicTestCase.myTryCatch(["list error"]));
-    }
-
-    function testTypeCheck() {
-        Assert.equals(5, BasicTestCase.myTypeCheck());
-    }
-
-    function testEnumerate() {
-        _testEnumerate();
-    }
-
-    function testGroups() {
-        _testGroups();
-    }
-
-    function testZip() {
-        _testZip();
-    }
-
-    function testLet() {
-        _testLet();
-    }
-
-    function testConstructors() {
-        Assert.equals("sup", BasicTestCase.myConstructedString);
-    }
-
-    function testCond() {
-        _testCond();
-    }
-
-    function testSetAndDeflocal() {
-        Assert.equals("another thing", BasicTestCase.mySetLocal());
-    }
-
-    function testOr() {
-        _testOr();
-    }
-
-    function testAnd() {
-        _testAnd();
-    }
-
-    function testNot() {
-        Assert.equals(false, BasicTestCase.myNot1);
-        Assert.equals(false, BasicTestCase.myNot2);
-    }
-
-    function testLambda() {
-        Assert.equals([5, 6].toString(), BasicTestCase.myFilteredList.toString());
-    }
-
-    function testWhen() {
-        Assert.equals(6, BasicTestCase.myWhen1);
-    }
-
-    function testQuickNths() {
-        _testQuickNths();
-    }
-
-    function testListDestructuring() {
-        _testListDestructuring();
-    }
-
-    function testDoFor() {
-        _testDoFor();
-    }
-
-    function testOptionalArguments() {
-        myOptionalFunc(5);
-    }
-
-    function testRestArguments() {
-        Assert.equals(5, myRest1);
-        Assert.equals(5, myRest2);
-        Assert.equals(5, myRest3);
-    }
-
-    function testCombinedOptRest() {
-        Assert.equals("abcd", myCombined1);
-        Assert.equals("aboop", myCombined2);
-        Assert.equals("ab", myCombined3);
-    }
-
-    function testFieldExps() {
-        _testFieldExps();
-    }
-
-    function testBreakContinue() {
-        _testBreakContinue();
-    }
-
-    function testAssert() {
-        _testAssert();
-    }
-
-    function testApply() {
-        _testApply();
-    }
-
-    function testApplyWithMethod() {
-        Assert.equals(30, applyWithMethod(new BasicObject(5)));
-        Assert.equals(18, applyWithMethod(new BasicObject(3)));
-    }
-
-    function testAnonymousObject() {
-        _testAnonymousObject();
-    }
-
-    function testCase() {
-        _testCase();
-    }
-
-    function testMaps() {
-        _testMaps();
-    }
-
-    function testRange() {
-        _testRange();
-    }
-
-    function testRest() {
-        _testRest();
-    }
-
-    function testTypeParsing() {
-        _testTypeParsing();
-    }
-
-    function testDefmacro() {
-        _testDefmacro();
-    }
-
-    function testDefmacroWithLogic() {
-        _testDefmacroWithLogic();
-    }
-
-    function testCallAlias() {
-        _testCallAlias();
-    }
-
-    function testLoadedFunction() {
-        Assert.equals("loaded", BasicTestCase.loadedFunction());
-    }
-
-    function testLoadInline() {
-        _testLoadInline();
-    }
-
-    function testAssignArith() {
-        _testAssignArith();
-    }
-
-    function testPatternLets() {
-        _testPatternLets();
-    }
-
-    function testRawString() {
-        _testRawString();
-    }
-
-    function testKissStrings() {
-        _testKissStrings();
-    }
-
-    function testArrowLambdas() {
-        _testArrowLambdas();
-    }
-
-    function testVoid() {
-        _testVoid();
-    }
-
-    function testLetThrow() {
-        _testLetThrow();
-    }
-
-    function testDotAccessOnAlias() {
-        _testDotAccessOnAlias();
-    }
-
-    function testClamp() {
-        _testClamp();
-    }
-
-    function testCountingLambda() {
-        _testCountingLambda();
-    }
-
-    function testExpComment() {
-        _testExpComment();
-    }
-
-    function testEval() {
-        #if (sys || hxnodejs)
-        _testEvalStatic();
-        _testEval();
-        #else
-        Assert.pass();
-        #end
-    }
-
-    function testCaseOnNull() {
-        _testCaseOnNull();
-    }
-
-    function testContains() {
-        _testContains();
-    }
-
-    function testIntersect() {
-        _testIntersect();
-    }
-
-    function testWhileLet() {
-        _testWhileLet();
-    }
-
-    function testTrace() {
-        _testTrace();
-    }
-
-    function testInsertUTestCase() {
-        _testInsertUTestCase();
-    }
-
-    function testQuickFractions() {
-        _testQuickFractions();
-    }
-    
-    function testWhenLetGuards() {
-        _testWhenLetGuards();
-    }
-     
-    function testImportAndUsingInBuildMacro() {
-        _testImportAndUsingInBuildMacro();
-    }
-     
-    function testPureKissClasses() {
-        _testPureKissClasses();
-    }
-
-    function testArraysToVariadic() {
-        _testArraysToVariadic();
-    }
-
-    function testThreadingSupportCheck() {
-        #if target.threaded
-        Assert.isTrue(_hasThreadSupport());
-        #else
-        Assert.isFalse(_hasThreadSupport());
-        #end
-    }
-
-    function testHaxeProperties() {
-        _testHaxeProperties();
-    }
-
-    function testWithFunctions() {
-        _testWithFunctions();
-    }
-
-    function testWithTempSet() {
-        _testWithTempSet();
-    }
-
-    var nullDefinedInHaxe = null;
-    static var staticNullDefinedInHaxe = null;
-
-    function testPrintMacros() {
-        // TODO Test the warnings
-        _testPrintMacrosInstance();
-        _testPrintMacrosStatic();
-    }
-
-    function testTypeCase() {
-        _testTypeCase();
-    }
-
-    #if (sys || hxnodejs)
-    function testTryProcess() {
-        // tryProcess returns null on failure:
-        Assert.equals(null, Prelude.tryProcess("_ThisCoMMaNDWillSURElYFaiLLLLLL", [], error->{return;}));
-        // tryProcess returns output on success:
-        Assert.equals("4.3.0", Prelude.tryProcess("haxe", ["--version"], error->{throw error;}));
-    }
-    #end
-
-    #if js
-    function testAwaitLet(async:utest.Async) {
-        _testAwaitLet(async);
-    }
-    #end
-
-    function testLambdaTypeAnnotations() {
-        _testLambdaTypeAnnotations();
-    }
-
-    function testCaseMacroError() {
-        _testCaseMacroError();
-    }
-
-    function testQuickPrintOnSetVar() {
-        _testQuickPrintOnSetVar();
-    }
-
-    function testSafeAccess() {
-        _testSafeAccess();
-    }
-
-    var aNullToPrint = null;
-}
-
-class BasicObject {
-    var val:Int;
-
-    public function new(val:Int) {
-        this.val = val;
-    }
-
-    public function multiply(otherVal:Int) {
-        return val * otherVal;
-    }
-}
diff --git a/kiss/src/test/cases/BasicTestCase.kiss b/kiss/src/test/cases/BasicTestCase.kiss
deleted file mode 100644
index d24b20d1..00000000
--- a/kiss/src/test/cases/BasicTestCase.kiss
+++ /dev/null
@@ -1,981 +0,0 @@
-// (load) brings in the fields and compile-time definitions of another Kiss file
-(load "BasicTestCaseExtra.kiss")
-
-(function _testLoadInline []
-    (let [&mut thatValue 5]
-        (load "BasicTestCaseExtra2.kiss")
-        (Assert.equals 50 thatValue)))
-
-// (var) declares static variables
-(var message "Howdy")
-
-(function _testHaxeInsertion []
-    // #| ... |# parses and injects raw Haxe code.
-    // Order of operations will apply
-    (Assert.equals 23 #|5 + 6 * 3|#)
-    // #{ ... }# parses and injects a raw Haxe block. It is preferred over #| |# 
-    (let [&mut a 5 &mut b 6]
-        #{
-            a += 6; b += 5;
-        }#
-        (Assert.equals 11 a)
-        (Assert.equals 11 b)))
-
-
-// (function) declares static functions
-(function myFloor [num] 
-    // funcalls can use dot access
-    (Math.floor num))
-
-// functions are resolved in the macro context
-(var funResult (myFloor 7.5))
-
-// (prop) declares instance variables
-(prop myField 5)
-
-// (method) declares instance methods
-(method myMethod [] this.myField)
-
-// [...] returns a Kiss array (they have special features and convert implicitly)
-(var myArray [1 2 3])
-
-// Array access is via nth
-(var myArrayLast (nth myArray -1))
-
-// (collect) turns iterators to arrays
-(function _testCollect []
-    (Assert.equals "[0,1,2]" (Std.string (collect (range 3)))))
-
-// Variadic math uses haxe's Lambda.fold under the hood
-(var mySum (+ 1 2 3))
-
-(var myDifference (- 5 4 3))
-
-(function _testMultiplication [] 
-    (Assert.equals 60 (* 2 5 6))
-    (Assert.equals 5522401584 (* 84 289 89 71 36))
-    (Assert.equals "heyheyhey" (* "hey" 3)))
-
-// All math operations return floats, none truncate by default
-(var myQuotient (/ 6 3 2 2))
-
-(var myRemainder (% 10 6))
-
-(var myPower (^ 2 8))
-
-(var &mut myNum 6)
-(var myInc ++myNum)
-
-(var myMin (min 9 3 7 1))
-(var myMax (max 9 3 7 1))
-
-(function _testLessThan []
-    (Assert.isTrue (< 1 2 3 4))
-    (Assert.isFalse (< 1 1 3 4))
-    (Assert.isFalse (< 1 12 12)))
-    
-(function _testLesserEqual []
-    (Assert.isTrue (<= 1 2 3 4))
-    (Assert.isTrue (<= 1 1 3 4))
-    (Assert.isFalse (<= 1 12 11)))
-
-(function _testGreaterThan []
-    (Assert.isTrue (> 4 3 2 1))
-    (Assert.isFalse (> 4 4 2 1))
-    (Assert.isFalse (> 9 3 3)))
-
-(function _testGreaterEqual []
-    (Assert.isTrue (>= 4 3 2 1))
-    (Assert.isTrue (>= 4 4 2 1))
-    (Assert.isFalse (>= 9 4 5)))
-
-(function _testEqual []
-    (Assert.isTrue (= 1 1 1 1))
-    (Assert.isFalse (= 1 2 1 1))
-    (Assert.isTrue (= "hey" "hey" "hey"))
-    (Assert.isFalse (= "hey" "you" "hey"))
-    (Assert.isTrue (= true true true))
-    (Assert.isFalse (= true false true))
-    (Assert.isTrue (= false false false)))
-
-(function _testIf []
-    (Assert.equals true (if 1 true false))
-    (Assert.equals true (if 0 true false))
-    (Assert.equals true (if -1 true false))
-    (Assert.equals false (if null true false))
-    (Assert.equals true (if true true false))
-    (Assert.equals false (if false true false))
-    (Assert.equals true (if "string" true false))
-    (Assert.equals false (if "" true false))
-    (Assert.equals false (if [] true false))
-    (Assert.equals true (if [1] true false))
-    (Assert.equals 5 (if true 5))
-    (Assert.equals null (if false 5)))
-
-(var :Int myInt 8)
-
-(function myTryCatch [:Any e]
-    (try
-        (throw e)
-        (catch [:String error] 5)
-        (catch [:Int error] 6)
-        (catch [error] 7)))
-
-(function myTypeCheck []
-    (the Int 5))
-
-(function _testConcat []
-    (Assert.equals (.toString [1 2 3 4]) (.toString (concat [1] [2 3] [4]))))
-
-(function _testGroups []
-    (Assert.equals (.toString [[1 2] [3 4]]) (.toString (groups [1 2 3 4] 2)))
-    (Assert.equals (.toString [[1 2 3] [4]]) (.toString (groups [1 2 3 4] 3 Keep)))
-    (try (begin (groups [1 2 3 4] 3 Throw) (Assert.fail))
-        (catch [error] (Assert.pass))))
-
-(function _testZip []
-    (Assert.equals (.toString [[1 2] [3 4]]) (.toString (zipThrow [1 3] [2 4])))
-    (Assert.equals (.toString [[1 2] [3 null]]) (.toString (zipKeep [1 3] [2])))
-    (Assert.equals (.toString [[1 2] [null 4]]) (.toString (zipKeep [1 null] [2 4])))
-    (try (begin (zipThrow [1 3] [2]) (Assert.fail))
-        (catch [error] (Assert.pass)))
-    (try (begin (zipThrow [1] [2 4]) (Assert.fail))
-        (catch [error] (Assert.pass)))
-    (Assert.equals (.toString [[1 2 3] [2 null 3]]) (.toString (zipKeep [1 2] [2] [3 3])))
-    (Assert.equals (.toString [[1 2]]) (.toString (zipDrop [1 2 3 4] [2])))
-    (Assert.equals (.toString [[1 2] [3 4]]) (.toString (apply zipThrow [[1 3] [2 4]]))))
-
-(function _testEnumerate []
-    (Assert.equals (.toString [[0 1] [1 2]]) (.toString (enumerate [1 2])))
-    (Assert.equals (.toString [[1 1] [2 2]]) (.toString (enumerate [1 2] 1))))
-
-(function _testLet []
-    (let [a 5
-            b 6
-            :String c "stuff"]
-        (Assert.equals 5 a)
-        (Assert.equals 6 b)
-        (Assert.equals "stuff" c))
-    (let [&mut a "str1"]
-        (Assert.equals "str1" a)
-        (set a "str2")
-        (Assert.equals "str2" a)))
-
-(var myConstructedString (new String "sup"))
-
-(function _testCond []
-    (Assert.equals "this one"
-        (cond 
-            ((= 5 6) "not this")
-            ((= 8 9) "not this either")
-            ((= 1 1) "this one")
-            (true "not the default")))
-    (Assert.equals "the default"
-        (cond 
-            ((= 5 6) "not this")
-            ((= 8 9) "not this either")
-            ((= 2 1) "not the third one")
-            (true "the default")))
-    (Assert.equals "this"
-        (cond
-            ((= 5 5) "this")
-            (true "default")))
-    (Assert.equals null
-        (cond
-            (false "not this"))))
-
-(function _testOr []
-    (Assert.equals 5 (or null 5))
-    // If the last value is falsy it can still be returned without breaking
-    // the expected behavior of or -- which also allows for the (or <optional arg> <default value>)
-    // idiom for empty arrays and strings
-    (Assert.equals (Std.string []) (Std.string (or null [])))
-    (Assert.equals "" (or null [] "")))
-
-(function _testAnd []
-    (Assert.equals 6 (and 5 6))
-    (Assert.isFalse ?(and false 5 6))
-    (Assert.isFalse ?(and 5 false 6)))
-
-(function mySetLocal []
-    (localVar &mut loc "one thing")
-    (set loc "another thing")
-    loc)
-
-(var myNot1 (not 5))
-(var myNot2 !5)
-
-(var myFilteredList (begin 
-    (localVar l [-1 -2 5 -3 6])
-    (l.filter (lambda [v] (< 0 v)))))
-
-(var myWhen1 (when true 5 6))
-
-(var myListOfTen [1 2 3 4 5 6 7 8 9 10])
-
-(function _testQuickNths []
-    (Assert.equals 1 (first myListOfTen))
-    (Assert.equals 2 (second myListOfTen))
-    (Assert.equals 3 (third myListOfTen))
-    (Assert.equals 4 (fourth myListOfTen))
-    (Assert.equals 5 (fifth myListOfTen))
-    (Assert.equals 6 (sixth myListOfTen))
-    (Assert.equals 7 (seventh myListOfTen))
-    (Assert.equals 8 (eighth myListOfTen))
-    (Assert.equals 9 (ninth myListOfTen))
-    (Assert.equals 10 (tenth myListOfTen))
-    (Assert.equals 10 (last myListOfTen)))
-
-(function _testListDestructuring []
-    (localVar [a b c d &mut e f g h i j] myListOfTen)
-    (Assert.equals 1 a)
-    (Assert.equals 2 b)
-    (Assert.equals 3 c)
-    (Assert.equals 4 d)
-    (Assert.equals 5 e)
-    (set e 6)
-    (Assert.equals 6 e)
-    (Assert.equals 6 f)
-    (Assert.equals 7 g)
-    (Assert.equals 8 h)
-    (Assert.equals 9 i)
-    (Assert.equals 10 j)
-
-    (let [[a b c &mut d e f g h i j] myListOfTen]
-        (Assert.equals 1 a)
-        (Assert.equals 2 b)
-        (Assert.equals 3 c)
-        (Assert.equals 4 d)
-        (set d 6)
-        (Assert.equals 6 d)
-        (Assert.equals 5 e)
-        (Assert.equals 6 f)
-        (Assert.equals 7 g)
-        (Assert.equals 8 h)
-        (Assert.equals 9 i)
-        (Assert.equals 10 j)))
-
-
-(var myMetaList [myListOfTen myListOfTen myListOfTen])
-
-(function _testDoFor []
-    (localVar &mut c 0)
-    (doFor v myListOfTen
-        (Assert.equals (+ c 1) v)
-        (set c v))
-    (doFor [a b c d e f g h i j] myMetaList
-        (Assert.equals 1 a)
-        (Assert.equals 2 b)
-        (Assert.equals 3 c)
-        (Assert.equals 4 d)
-        (Assert.equals 5 e)
-        (Assert.equals 6 f)
-        (Assert.equals 7 g)
-        (Assert.equals 8 h)
-        (Assert.equals 9 i)
-        (Assert.equals 10 j)))
-
-(function _testFor []
-    (localVar incrementedList (for v myListOfTen (+ 1 v)))
-    (let [[a b c d e f g h i j] incrementedList]
-        (Assert.equals 2 a)
-        (Assert.equals 3 b)
-        (Assert.equals 4 c)
-        (Assert.equals 5 d)
-        (Assert.equals 6 e)
-        (Assert.equals 7 f)
-        (Assert.equals 8 g)
-        (Assert.equals 9 h)
-        (Assert.equals 10 i)
-        (Assert.equals 11 j))
-    (localVar smallerMetaList (for [a b c d e f g h i j] myMetaList [a e i]))
-    (doFor [a e i] smallerMetaList
-        (Assert.equals 1 a)
-        (Assert.equals 5 e)
-        (Assert.equals 10 i)))
-
-(function myOptionalFunc [a &opt b c]
-    (Assert.equals 5 a)
-    (Assert.equals null b)
-    (Assert.equals 6 (or c 6))) // (or [optionalVar] [defaultValue]) is the convention for default values
-
-(function myRestSum [firstOne &rest :List<Int> others]
-    (localVar &mut sum firstOne)
-    (doFor nextOne others (set sum (+ sum nextOne)))
-    sum)
-
-(var myRest1 (myRestSum 5))
-(var myRest2 (myRestSum 1 1 1 1 1))
-(var myRest3 (myRestSum 1 2 2))
-
-(function myCombinedOptRest [firstOne &opt secondOne &rest :List<String> thirdAndMore]
-    (localVar &mut concatString (+ firstOne (or secondOne "boop")))
-    (doFor str thirdAndMore (set concatString (+ concatString str)))
-    concatString)
-
-(var myCombined1 (myCombinedOptRest "a" "b" "c" "d"))
-(var myCombined2 (myCombinedOptRest "a"))
-(var myCombined3 (myCombinedOptRest "a" "b"))
-
-(function _testFieldExps []
-    (Assert.equals "hey" (.trim "  hey "))
-    (Assert.equals "e" (.charAt (.trim "  hey ") 1)))
-
-(function _testBreakContinue []
-    (let [[a b c]
-                (for val [1 2 3 4 5 6 7 8]
-                    (if (> val 6)
-                            (break)
-                        (if !(= 0 (% val 2))
-                                (continue)
-                            val)))]
-        (Assert.equals 2 a)
-        (Assert.equals 4 b)
-        (Assert.equals 6 c)))
-
-(function _testAssert []
-    (try
-            (assert false (+ "false " "should " "have " "been " "true"))
-        (catch [:String message]
-            (Assert.equals "kiss/src/test/cases/BasicTestCase.kiss:338:13: Assertion failed: false should have been true
-From:[(assert false (+ \"false \" \"should \" \"have \" \"been \" \"true\"))]" message)))
-    
-    (assert true)
-    (assert ![])
-    (assertEquals 6 6 6))
-
-(function _testApply []
-    (Assert.equals 6 (apply + [1 2 3])))
-
-(function applyWithMethod [obj]
-    (apply .multiply obj [6]))
-
-(function _testAnonymousObject []
-    (let [obj
-                (object
-                    a "string A"
-                    b 5)]
-        (Assert.equals "string A" obj.a)
-        (Assert.equals 5 obj.b)))
-
-(function toOption [:Dynamic value]
-    (if value (Some value) None))
-
-(function _testCase []
-    // otherwise branch must come last
-    (assertThrowsAtCompileTime (case null (otherwise "thing") (v "OtherThing")))
-    // Even if it is in (never otherwise) form
-    (assertThrowsAtCompileTime (case null (never otherwise) (v "OtherThing")))
-    // null must be matched
-    (assertThrowsAtCompileTime (case null (v "thing")))
-    (case (toOption [])
-        (None (Assert.pass))
-        (never otherwise))
-    (case (toOption "hey")
-        (never None)
-        ((Some "hey") (Assert.pass))
-        (never otherwise))
-    (Assert.equals 5 (case (toOption 0)
-        (otherwise 5)))
-    // Test case with guards and multiple values
-    (case 5
-        ((or 5 6) (Assert.pass))
-        (otherwise (Assert.fail)))
-    (case [2 3]
-        ((or [_ 3] [1 1]) (Assert.pass))
-        (otherwise (Assert.fail)))
-    (case 5
-        ((when false (or 5 6)) (Assert.fail))
-        ((when true (or 7 8 9)) (Assert.fail))
-        (otherwise (Assert.pass)))
-    (case 5
-        ((unless true (or 5 6)) (Assert.fail))
-        ((unless false (or 7 8 9)) (Assert.fail))
-        (otherwise (Assert.pass)))
-    // In Haxe,
-    // `switch (Some(true)) { case Some(true | false): "a"; default: "b"; }`
-    // returns "a", so nested use of `or` in case patterns should also be valid:
-    (case (Some true)
-        ((Some (or true false))
-            (Assert.pass))
-        (otherwise (Assert.fail)))
-    (case (Some 5)
-        ((Some (or 6 5 4))
-            (Assert.pass))
-        (otherwise (Assert.fail)))
-    // In Haxe, name = Pattern can be used in switch/case to match values: https://haxe.org/manual/lf-pattern-matching-variable-capture.html
-    // In Kiss, the syntax for this is (as name pattern)
-    (case (Some (Some 5))
-        ((Some (as inner (Some v)))
-            (Assert.equals 5 v)
-            (Assert.isTrue (Type.enumEq (Some 5) inner)))
-        (otherwise (Assert.fail)))
-    
-    // Otherwise blocks should allow multiple expressions, too:
-    (case 5
-        (otherwise
-            6 5)))
-
-(function _testMaps []
-    (localVar :Map<String,String> myMap [=>"hey" "you"
-                        =>"found" "me"])
-    (Assert.equals "you" (dictGet myMap "hey"))
-    (Assert.equals "me" (dictGet myMap "found"))
-    (doFor =>key value myMap
-        (assertLet [(Some _) (indexOf ["hey" "found"] key)] 0)
-        (assertLet [(Some _) (indexOf ["you" "me"] value)] 0))
-
-    // Map destructuring:
-    (let [[=>"hey" v1 =>"found" v2] myMap]
-        (Assert.equals "you" v1)
-        (Assert.equals "me" v2)))
-
-(function _testRange []
-    // With just one arg, it's the max:
-    (localVar &mut :kiss.List<Int> myList (for i (range 5) i))
-    (Assert.equals 4 (nth myList -1))
-    // with two args, they are min and max:
-    (set myList (for i (range 3 5) i))
-    (Assert.equals 3 (first myList))
-    (Assert.equals 4 (last myList))
-    // With three args, they are min, max, and step:
-    (set myList (for i (range 7 17 2) i))
-    (Assert.equals 7 (first myList))
-    (Assert.equals 9 (second myList))
-    (Assert.equals 15 (last myList)))
-
-(function _testRest []
-    (Assert.equals (.toString [2 3 4]) (.toString (rest [1 2 3 4]))))
-
-(function doSomething [:Int->Int func]
-    (func 5))
-
-(function itsAMonster [:Null<Map<String,Map<String,Array<String>>>> monsterArg] "but it still compiles")
-
-(function _testTypeParsing []
-    // Do stuff with functions that take complex type parameters, mostly just to check if it compiles
-    (Assert.equals 5 (doSomething (lambda [i] i)))
-    (Assert.equals 7 (doSomething (lambda [i] (+ i 2))))
-    // Pass null to the really crazy one because I'm lazy:
-    (Assert.equals "but it still compiles" (itsAMonster null)))
-
-(defMacro defconstfunc [name const] `(function ,name [] ,const))
-
-(defconstfunc func5 5)
-(defconstfunc funcHello "hello")
-
-(function _testDefmacro []
-    (Assert.equals 5 (func5))
-    (Assert.equals "hello" (funcHello)))
-
-(var &mut welcomeCount 0)
-(defMacro macroWithLogic [name]
-    (localVar message1 (ReaderExp.StrExp "Welcome "))
-    (localVar message2 (ReaderExp.StrExp " (Guest #"))
-    (localVar message3 (ReaderExp.StrExp ")"))
-    
-    `(begin (set welcomeCount (+ welcomeCount 1))
-        (+ ,message1 ,name ,message2 (Std.string welcomeCount) ,message3)))
-
-(function _testDefmacroWithLogic []
-    (Assert.equals "Welcome Stevo (Guest #1)" (macroWithLogic "Stevo"))
-    (Assert.equals "Welcome Bob (Guest #2)" (macroWithLogic "Bob")))
-
-// Make sure built-in call aliases don't override user-defined variables
-(function _testCallAlias []
-    (let [map [=>"hey" "you"]]
-        (Assert.equals "you" (dictGet map "hey"))))
-
-(function _testAssignArith []
-    (localVar &mut num 5)
-    (+= num 5 6)
-    (Assert.equals 16 num)
-    (%= num 5)
-    (Assert.equals 1 num)
-    (^= num 3)
-    (Assert.equals 1 num)
-    (*= num 25 2)
-    (Assert.equals 50 num)
-    (/= num 25 2)
-    (Assert.equals 1 num)
-    (-= num 5 6)
-    (Assert.equals -10 num))
-
-// these declarations have to come before the ifLets to get the type detection correct for issue 64
-(var :String realStringVar "something")
-(var :String nullStringVar null)
-
-(function issue64withArgs [:String realStringArg :String nullStringArg]
-    (unlessLet [something realStringArg]
-            (Assert.fail))
-        (whenLet [something nullStringArg]
-            (Assert.fail)))
-
-(function _testPatternLets []
-    (let [some5 (Some 5)
-            some6 (Some 6)
-            none None
-            :Null<Option<Any>> oops null]
-        (ifLet [(Some a) some5
-                (Some b) some6]
-                (Assert.equals 11 (+ a b))
-            (Assert.fail))
-        (ifLet [(Some a) none]
-            (Assert.fail))
-        (whenLet [(Some a) oops]
-            (print "something went wrong!")
-            (Assert.fail))
-        (unlessLet [(Some (or 5 6)) some5]
-            (print "something else went wrong!")
-            (Assert.fail))
-            
-        // Don't double evaluate the expression:    
-        (let [&mut v 1]
-            (unlessLet [2 (begin (+= v 1) v)]
-                (Assert.fail))
-            (Assert.equals 2 v))
-            
-        (assertThrows (assertLet [(Some thing) none] thing))
-        (Assert.equals 5 (assertLet [(Some thing) some5] thing)))
-        
-        // Issue #64 regression tests:
-        (whenLet [something null]
-            (Assert.fail))
-        (let [:String realString "something"
-                :String nullString null]
-            (unlessLet [something realString]
-                (Assert.fail))
-            (whenLet [something nullString]
-                (Assert.fail)))
-        (unlessLet [something realStringVar]
-            (Assert.fail))
-        (whenLet [something nullStringVar]
-            (Assert.fail))
-        (issue64withArgs "something" null))
-
-(function _testRawString []
-    (Assert.equals "\\"  #"\"#)
-    (Assert.equals "\"#"  ##""#"##))
-
-(function _testKissStrings []
-    (Assert.equals #{ "\\\t\r\n\"$"; }# "\\\t\r\n\"\$")
-    (let [str "it's"
-            num 3
-            l1 ["a" "b" "c"]
-            l2 [1 2 3]]
-        // string interpolation:
-        (Assert.equals "it's 3asy as [a,b,c] [1,2,3]" "$str ${num}asy as $l1 $l2")))
-
-(function _testArrowLambdas []
-    (let [withArgs
-                ->[arg1 arg2] (+ arg1 arg2)
-            withArg
-                ->arg (* 2 arg)
-            withoutArgs
-                ->{
-                    (+ 5)
-                    6}
-            &mut num 5
-            void
-                ->:Void [] (set num 6)]
-        (Assert.equals 11 (withArgs 5 6))
-        (Assert.equals 12 (withArg 6))
-        (Assert.equals 6 (withoutArgs))
-        (void)
-        (Assert.equals 6 num)))
-
-(var &mut voidRan false)
-(function :Void myVoid [] (set voidRan true))
-(function _testVoid []
-    (myVoid)
-    (Assert.isTrue voidRan))
-
-(function _testLetThrow []
-    (try
-            {
-                (letThrow 
-                        (throw "the error we want")
-                    (catch [e] (Assert.fail)))
-                (Assert.fail)}
-        (catch [:String e]
-            (Assert.equals "the error we want" e))))
-
-// Test dot-access on identifiers aliases
-(var objWithField (object field 5))
-(var float 0.5) // This should still read as a float, not a dot access on a variable called 0
-(defAlias &ident owf objWithField)
-(function _testDotAccessOnAlias []
-    (Assert.equals 5 owf.field))
-
-(function _testClamp []
-    (let [&mut bigValue 12
-            &mut smallValue 3]
-        (Assert.equals 10 (clamp bigValue 5 10))
-        (Assert.equals 10 bigValue)
-        (Assert.equals 5 (clamp smallValue 5 10))
-        (Assert.equals 5 smallValue)))
-
-(function _testCountingLambda []
-    (let [fullSyntax
-                (countingLambda a [] a)
-            arrowSyntax
-                -+>b {b}]
-        (Assert.equals 1 (fullSyntax))
-        (Assert.equals 2 (fullSyntax))
-        (Assert.equals 1 (arrowSyntax))
-        (Assert.equals 2 (arrowSyntax))))
-
-(function _testExpComment []
-    (Assert.equals 15 (+ **6 5 **(- 5 11) 5 (+ 5 **(20 9)))))
-
-(var staticValue 9)
-(prop value 2)
-(method _testEval []
-    (Assert.equals 9 (eval 'staticValue))
-    (Assert.equals 2 (eval 'value))
-    (Assert.equals 11 (eval '(+ staticValue value))))
-
-(function _testEvalStatic []
-    (Assert.equals 9 (eval 'staticValue))
-    (assertThrows (eval 'value)))
-
-(function _testCaseOnNull []
-    (Assert.equals 5 (case null (v 10) (null 5)))
-    (Assert.equals 5 (case null (v 10) (null 5) (otherwise 6)))
-    (Assert.equals 5 (case null (v 10) (otherwise 5))))
-
-(function _testContains []
-    (assert (contains "abc" "b"))
-    (assert !(contains "abc" "z"))
-    (assert (contains [1 2 3] 1))
-    (assert !(contains [1 2 3] 5))
-    (Assert.pass))
-
-(function _testIntersect []
-    (let [intersection2d
-                (for i (intersect (.split "abc" "") (.split "xyz" "")) (i.join ""))
-            intersection3d
-                (for i (intersect (.split "abc" "") (.split "xyz" "") (.split "123" "")) (i.join ""))]
-        (assert (contains intersection2d "ax"))
-        (assert (contains intersection2d "ay"))
-        (assert (contains intersection2d "az"))
-        (assert (contains intersection2d "bx"))
-        (assert (contains intersection2d "by"))
-        (assert (contains intersection2d "bz"))
-        (assert (contains intersection2d "cx"))
-        (assert (contains intersection2d "cy"))
-        (assert (contains intersection2d "cz"))
-        (assert (contains intersection3d "ax1"))
-        (assert (contains intersection3d "ax3"))
-        (assert (contains intersection3d "bx3"))
-        (assert (contains intersection3d "cy1"))
-        (assert (contains intersection3d "cy3"))
-        )
-    (Assert.pass))
-
-(function _testWhileLet []
-    (let [&mut idx 0
-            lines ["a" "b" "c"]
-            stream (Stream.fromString "a\nb\nc")]
-        (whileLet [(Some line) (stream.takeLine)]
-            (Assert.equals (nth lines idx) line)
-            (+= idx 1))))
-
-(function _testTrace []
-    (Assert.equals 5 (trace 5 "num"))
-    (Assert.equals 5 ~5))
-
-// The test here is that this was inserted by insertUTestCase :)
-(function _testInsertUTestCase []
-    (Assert.pass))
-
-(function _testQuickFractions []
-    (Assert.equals 0.5 (fHalf 1))
-    (Assert.equals 0 (iHalf 1)))
-
-(function _testWhenLetGuards []
-    // Guards should be allowed in whenLet patterns
-    (whenLet [(when true 5) 5]
-        (Assert.pass)))
-
-(function _testImportAndUsingInBuildMacro []
-    (assertThrowsAtCompileTime (import pack.Type))
-    (assertThrowsAtCompileTime (importAs pack.Type Alias))
-    (assertThrowsAtCompileTime (importAll pack))
-    (assertThrowsAtCompileTime (using pack.Type))
-    (Assert.pass))
-
-(function _testPureKissClasses []
-    (PureKissClass.test)
-    (Assert.pass))
-
-(function _testArraysToVariadic []
-    (let [a [5 6 7]]
-        (assertThrows (+ a))
-        (assertThrows (- a))
-        (assertThrows (* a))
-        (assertThrows (/ a))
-        (assertThrows (min a))
-        (assertThrows (max a))
-        (assertThrows (= a))
-        (assertThrows (< a))
-        (assertThrows (<= a))
-        (assertThrows (> a))
-        (assertThrows (>= a))
-        
-        )
-    (Assert.pass))
-
-(function _hasThreadSupport []
-    (#if target.threaded
-            true
-        false))
-
-(var &mut _staticProp 5)
-(var :Int staticProp (property get set))
-(function set_staticProp [v] (set _staticProp v))
-(function get_staticProp [] _staticProp)
-
-(var :(Int,Int)->Bool lambdaTest ->[a b] true)
-(var :()->Void lambdaTest2 ->[] (return))
-(function _testLambdaTypeAnnotations []
-    (Assert.isTrue (lambdaTest 5 6))
-    (lambdaTest2))
-
-(defMacro __testCaseMacroError1 []
-    (case ["thing" 2] `5))
-
-(defMacro __testCaseMacroError2 []
-    (case 5
-        ((Some v) `false)
-        (otherwise `false)))
-
-(defMacro __testCaseMacroError3 []
-    (case 5
-        ([not this] `false)
-        (otherwise `false)))
-
-(defMacro __testCaseMacroError4 [s]
-    (case (symbolNameValue s)
-        ("rightSymbol" `true)
-        (otherwise `false)))
-
-(defMacro __testCaseMacroError5 [n]
-    (case (eval n)
-        (5 `true)
-        (otherwise `false)))
-
-(function _testCaseMacroError []
-    (assertThrowsAtCompileTime
-        (__testCaseMacroError1))
-    (assertThrowsAtCompileTime
-        (__testCaseMacroError2))
-    (assertThrowsAtCompileTime
-        (__testCaseMacroError3))
-    (Assert.isTrue (__testCaseMacroError4 rightSymbol))
-    (Assert.isFalse (__testCaseMacroError4 wrongSymbol))
-    (Assert.isTrue (__testCaseMacroError5 5))
-    (Assert.isFalse (__testCaseMacroError5 6)))
-
-(function _testHaxeProperties []
-    (Assert.equals 5 staticProp)
-    (Assert.equals 9 (set staticProp 9))
-    (Assert.equals 9 staticProp)
-    (Assert.equals 9 _staticProp))
-
-(function _testWithFunctions []
-    (withFunctions
-        [
-            (a [val] (+ val 1))
-            (b [val] (+ val 2))
-        ]
-        (localFunction c [val] (+ (a val) (b val)))
-        (Assert.equals 5 (c 1))))
-
-(function _testWithTempSet []  
-    (let [&mut v 5
-            &mut v2 3]
-        (assertEquals 5 v)
-        (assertEquals 3 v2)
-        (withTempSet [v 6]
-            (assertEquals 6 v)
-            (assertEquals 3 v2))
-        (assertEquals 5 v)
-        (assertEquals 3 v2)
-        (withTempSet [v 7 v2 9]
-            (assertEquals 7 v)
-            (assertEquals 9 v2))
-        (assertEquals 5 v)
-        (assertEquals 3 v2))
-    (Assert.pass))
-
-(var &mut savedPrints [])
-(function savePrint []
-    (set savedPrints [])
-    ->:Void [:String s] (savedPrints.push s))
-
-(prop anotherNullToPrint null)
-(var anotherStaticNullToPrint null)
-
-(method _testPrintMacrosInstance []
-    (withTempSet [Prelude.printStr (savePrint)]
-        (printAllNulls)
-        (Assert.isTrue (savedPrints.contains "anotherNullToPrint: null"))
-        (Assert.isTrue (savedPrints.contains "anotherStaticNullToPrint: null"))
-        (Assert.isTrue (savedPrints.contains "nullDefinedInHaxe: null"))
-        (Assert.isTrue (savedPrints.contains "staticNullDefinedInHaxe: null"))
-        
-        // TODO This statement prints a warning at compile-time, which won't
-        // appear in savedPrints, so it's harder to test...
-        (prop tp "bad")
-        
-        (let [u null]
-            // TODO this statement should print a warning at compile-time (#112) 
-            (localVar v "bad")
-
-            (set savedPrints [])
-            (printLocalNulls)
-            (Assert.isFalse (savedPrints.contains "anotherNullToPrint: null"))
-            (Assert.isFalse (savedPrints.contains "anotherStaticNullToPrint: null"))
-            (Assert.isTrue (savedPrints.contains "u: null")))))
-
-(function _testPrintMacrosStatic []
-    (withTempSet [Prelude.printStr (savePrint)]
-        (printAllNulls)
-        (Assert.isTrue (savedPrints.contains "anotherStaticNullToPrint: null"))
-        (Assert.isTrue (savedPrints.contains "staticNullDefinedInHaxe: null"))
-
-        // TODO This statement prints a warning at compile-time, which won't
-        // appear in savedPrints, so it's harder to test...
-        (var ts "bad")
-
-        (let [u null]
-            // TODO this statement should print a warning at compile-time (#112) 
-            (localVar v "bad")
-
-            (set savedPrints [])
-            (printLocalNulls)
-            (Assert.isFalse (savedPrints.contains "anotherStaticNullToPrint: null"))
-            (Assert.isTrue (savedPrints.contains "u: null")))
-        
-        // Test for loop capture variables
-        (set savedPrints [])
-        (doFor a (for _ (range 5) null)
-            (printLocalNulls))
-        (Assert.isTrue (savedPrints.contains "a: null"))
-        (Assert.equals 5 savedPrints.length)
-        
-        (set savedPrints [])
-        (let [:Map<String,String> m (for a (range 5) =>"$a" "a")]
-            (doFor =>k v m
-                (set k null)
-                (printLocalNulls)))
-        (Assert.isTrue (savedPrints.contains "k: null"))
-        (Assert.equals 5 savedPrints.length)
-
-        (set savedPrints [])
-        (let [:Map<Int,String> m (for a (range 5) =>a null)]
-            (doFor =>k v m
-                (printLocalNulls)))
-        (Assert.isTrue (savedPrints.contains "v: null"))
-        (Assert.equals 5 savedPrints.length)
-        
-        (set savedPrints [])
-        (doFor [a b c] (for _ (range 5) [1 null 5])
-            (printLocalNulls))
-        (Assert.isTrue (savedPrints.contains "b: null"))
-        (Assert.equals 5 savedPrints.length)
-
-        (set savedPrints [])
-        (doFor :String s (for _ (range 5) null)
-            (printLocalNulls))
-        (Assert.isTrue (savedPrints.contains "s: null"))
-        (Assert.equals 5 savedPrints.length)
-
-        // Test case extraction locals:
-        (set savedPrints [])
-        (case None
-            (None (printLocalNulls) /* Won't print */)
-            (otherwise))
-        (case (Some null)
-            ((Some v) (printLocalNulls))
-            (otherwise))
-        (Assert.isTrue (savedPrints.contains "v: null"))
-        (Assert.equals 1 savedPrints.length)
-
-        (set savedPrints [])
-        (case (Some (Some (Some [1 2 null])))
-            ((Some (Some (Some [a b c])))
-                (printLocalNulls))
-            (otherwise))
-        (Assert.isTrue (savedPrints.contains "c: null"))))
-
-(function :Void _testTypeCase []
-    (typeCase ["a"]
-        ([:String a]
-            (Assert.equals "a" a)))
-    (typeCase ["a" 1]
-        (never [:String a :String one])
-        ([:String a :Int one]
-            (Assert.equals "a1" "${a}${one}")))
-    (typeCase ["a" 5 5.5 true]
-        ([:String a :Int five :Float fivePointFive :Bool tt]
-            (Assert.equals "a55.5true" "${a}${five}${fivePointFive}${tt}"))
-        (never otherwise)))
-
-(#when js
-    (function _testAwaitLet [:utest.Async async]
-        (localFunction :Promise<Bool> newPromise [:Bool succeed]
-            (new Promise
-                ->:Void [
-                    :Bool->Void resolve
-                    :Dynamic->Void reject
-                ] (if succeed (resolve true) (reject false))))
-                
-        (awaitLet [result (newPromise true)]
-            (catch [:Dynamic e] (Assert.fail))
-            (Assert.isTrue result)
-            (awaitLet [res1 (newPromise false)
-                        res2 (newPromise true)
-                        res3 (newPromise true)]
-                (catch [:Dynamic e]
-                    (Assert.isFalse e)
-                    (awaitLet [res1 (newPromise true)
-                                res2 (newPromise false)
-                                res3 (newPromise true)]
-                        (catch [:Dynamic e]
-                            (Assert.isFalse e)
-                            (awaitLet [res1 (newPromise true)
-                                        res2 (newPromise true)
-                                        res3 (newPromise false)]
-                                (catch [:Dynamic e]
-                                    (Assert.isFalse e)
-                                    (awaitLet [res1 (newPromise true)
-                                                res2 (newPromise res1)
-                                                res3 (newPromise res2)]
-                                        (Assert.isTrue ?(and res1 res2 res3))
-                                        (async.done))
-                                    e)
-                                (Assert.fail))
-                            e)
-                        (Assert.fail))
-                    e)
-                (Assert.fail)))))
-        
-
-(function _testQuickPrintOnSetVar []
-    (let [&mut v 5]
-        (set (trace v) 7)
-        (set (print v) 8)
-        (set (Prelude.print v) 9)
-        (set ~v 6)
-        (Assert.equals v 6)))
-
-(defAlias &ident otherNameForObj obj)
-(function _testSafeAccess []
-    (let [:Dynamic obj null]
-        (obj?.doThing)
-        (otherNameForObj?.doThing)
-        (?.doThing obj)
-        (?.doThing otherNameForObj))
-    (Assert.pass))
\ No newline at end of file
diff --git a/kiss/src/test/cases/BasicTestCaseExtra.kiss b/kiss/src/test/cases/BasicTestCaseExtra.kiss
deleted file mode 100644
index 45fee349..00000000
--- a/kiss/src/test/cases/BasicTestCaseExtra.kiss
+++ /dev/null
@@ -1 +0,0 @@
-(function loadedFunction [] "loaded")
diff --git a/kiss/src/test/cases/BasicTestCaseExtra2.kiss b/kiss/src/test/cases/BasicTestCaseExtra2.kiss
deleted file mode 100644
index 0d28b5c2..00000000
--- a/kiss/src/test/cases/BasicTestCaseExtra2.kiss
+++ /dev/null
@@ -1,2 +0,0 @@
-// Using inline (load) for something like this would actually be terrible:
-(set thatValue 50)
\ No newline at end of file
diff --git a/kiss/src/test/cases/CommentAtEndOfFileTestCase.hx b/kiss/src/test/cases/CommentAtEndOfFileTestCase.hx
deleted file mode 100644
index 514d86df..00000000
--- a/kiss/src/test/cases/CommentAtEndOfFileTestCase.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.Prelude;
-import kiss.List;
-
-@:build(kiss.Kiss.build())
-class CommentAtEndOfFileTestCase extends Test {}
diff --git a/kiss/src/test/cases/CommentAtEndOfFileTestCase.kiss b/kiss/src/test/cases/CommentAtEndOfFileTestCase.kiss
deleted file mode 100644
index ee11210b..00000000
--- a/kiss/src/test/cases/CommentAtEndOfFileTestCase.kiss
+++ /dev/null
@@ -1,5 +0,0 @@
-(function myFun []
-    (localVar something 5)
-    )
-
-// This comment used to cause a hard-to-track-down error!
diff --git a/kiss/src/test/cases/CommentAtEndOfListTestCase.hx b/kiss/src/test/cases/CommentAtEndOfListTestCase.hx
deleted file mode 100644
index edf08dd2..00000000
--- a/kiss/src/test/cases/CommentAtEndOfListTestCase.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.Prelude;
-import kiss.List;
-
-@:build(kiss.Kiss.build())
-class CommentAtEndOfListTestCase extends Test {}
diff --git a/kiss/src/test/cases/CommentAtEndOfListTestCase.kiss b/kiss/src/test/cases/CommentAtEndOfListTestCase.kiss
deleted file mode 100644
index 36da308e..00000000
--- a/kiss/src/test/cases/CommentAtEndOfListTestCase.kiss
+++ /dev/null
@@ -1,4 +0,0 @@
-(function myFun []
-    (localVar something 5)
-    // This comment used to cause a hard-to-track-down error!
-    )
diff --git a/kiss/src/test/cases/CompilerToolsTestCase.hx b/kiss/src/test/cases/CompilerToolsTestCase.hx
deleted file mode 100644
index 4bc6d1b0..00000000
--- a/kiss/src/test/cases/CompilerToolsTestCase.hx
+++ /dev/null
@@ -1,70 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.CompilerTools;
-import kiss.Prelude;
-
-using StringTools;
-
-#if macro
-import haxe.macro.Expr;
-import haxe.macro.Context;
-#end
-
-class CompilerToolsTestCase extends Test {
-    // Skip these tests on C# for now because they will fail due to this haxe bug:
-    // https://github.com/HaxeFoundation/haxe/issues/10332
-    #if ((sys || hxnodejs) && !cs)
-    function testCompileHelloWorldJs() {
-        Assert.equals("Hello world!", _testCompileHelloWorldJs()().trim());
-        Assert.equals("Hello world!", _testCompileHelloWorldJsWithPackageJson()().trim());
-    }
-
-    static macro function _testCompileHelloWorldJs() {
-        return CompilerTools.compileFileToScript(
-            "kiss/template/src/template/Main_.kiss", JavaScript, {
-                outputFolder: "bin/helloWorldJsTest",
-            });
-    }
-
-    static macro function _testCompileHelloWorldJsWithPackageJson() {
-        return CompilerTools.compileFileToScript(
-            "kiss/template/src/template/Main_.kiss", JavaScript, {
-                outputFolder: "bin/helloWorldJsTestWithPackageJson",
-                langProjectFile: "src/test/files/package.json"
-            });
-    }
-
-    function testCompileHelloWorldPy() {
-        Assert.equals("Hello world!", _testCompileHelloWorldPy()().trim());
-        Assert.equals("Hello world!", _testCompileHelloWorldPyWithRequirementsTxt()().trim());
-        Assert.equals("Hello world!", _testCompileHelloWorldPyWithSetupPy()().trim());
-    }
-
-    static macro function _testCompileHelloWorldPy() {
-        return CompilerTools.compileFileToScript(
-            "kiss/template/src/template/Main_.kiss", Python, {
-                outputFolder: "bin/helloWorldPyTest",
-            });
-    }
-
-    static macro function _testCompileHelloWorldPyWithRequirementsTxt() {
-        return CompilerTools.compileFileToScript(
-            "kiss/template/src/template/Main_.kiss", Python, {
-                outputFolder: "bin/helloWorldPyTestWithRequirementsTxt",
-                langProjectFile: "src/test/files/requirements.txt"
-            });
-    }
-
-    static macro function _testCompileHelloWorldPyWithSetupPy() {
-        return CompilerTools.compileFileToScript(
-            "kiss/template/src/template/Main_.kiss", Python, {
-                outputFolder: "bin/helloWorldPyTestWithSetupPy",
-                langProjectFile: "src/test/files/setup.py"
-            });
-    }
-
-    // TODO test what happens when passing more arguments/files
-    #end
-}
diff --git a/kiss/src/test/cases/ConditionalCompilationTestCase.hx b/kiss/src/test/cases/ConditionalCompilationTestCase.hx
deleted file mode 100644
index 49950ceb..00000000
--- a/kiss/src/test/cases/ConditionalCompilationTestCase.hx
+++ /dev/null
@@ -1,56 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.Prelude;
-
-@:build(kiss.Kiss.build())
-class ConditionalCompilationTestCase extends Test {
-    function testIf() {
-        #if interp
-        Assert.isTrue(runningInHaxe);
-        #else
-        Assert.isFalse(runningInHaxe);
-        #end
-
-        #if (py || js)
-        Assert.isTrue(runningInPyOrJs);
-        #end
-    }
-
-    function testWhen() {
-        #if interp
-        Assert.equals(6, number());
-        #else
-        Assert.equals(5, number());
-        #end
-    }
-
-    function testUnless() {
-        #if !interp
-        Assert.equals(9, number2());
-        #else
-        Assert.equals(12, number2());
-        #end
-    }
-
-    function testCond() {
-        #if cpp
-        Assert.equals("C++", targetLanguage);
-        #elseif cs
-        Assert.equals("C#", targetLanguage);
-        #elseif interp
-        Assert.equals("Haxe", targetLanguage);
-        #elseif hxnodejs
-        Assert.equals("NodeJS", targetLanguage);
-        #elseif js
-        Assert.equals("JavaScript", targetLanguage);
-        #elseif python
-        Assert.equals("Python", targetLanguage);
-        #end
-    }
-
-    function testCase() {
-        _testCase();
-    }
-}
diff --git a/kiss/src/test/cases/ConditionalCompilationTestCase.kiss b/kiss/src/test/cases/ConditionalCompilationTestCase.kiss
deleted file mode 100644
index d1bc705f..00000000
--- a/kiss/src/test/cases/ConditionalCompilationTestCase.kiss
+++ /dev/null
@@ -1,33 +0,0 @@
-(var runningInHaxe (#if interp true false))
-(var runningInPyOrJs (#if (or py js) true false))
-
-(function number []
-    (let [&mut num 5]
-        (#when interp
-            (+= num 5)
-            (-= num 4))
-        num))
-
-(function number2 []
-    (let [&mut num 12]
-        (#unless interp
-            (+= num 5)
-            (-= num 8))
-        num))
-
-(var targetLanguage
-    (#cond
-        (cpp "C++")
-        (cs "C#")
-        (interp "Haxe")
-        (hxnodejs "NodeJS")
-        (js "JavaScript")
-        (python "Python")))
-
-(function _testCase []
-    (#case var1ForCase
-        ("var1" (Assert.pass))
-        (otherwise (Assert.fail)))
-    (#case var2ForCase
-        ("var2" (Assert.pass))
-        (otherwise (Assert.fail))))
diff --git a/kiss/src/test/cases/DSL.kiss b/kiss/src/test/cases/DSL.kiss
deleted file mode 100644
index 4baece2e..00000000
--- a/kiss/src/test/cases/DSL.kiss
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO make a better position reification scheme here
-(defReaderMacro "goop" [stream] `(Assert.isTrue true))
-(defReaderMacro "gloop" [stream] `(Assert.isFalse false))
\ No newline at end of file
diff --git a/kiss/src/test/cases/DSLScript.dsl b/kiss/src/test/cases/DSLScript.dsl
deleted file mode 100644
index e2ef2c9c..00000000
--- a/kiss/src/test/cases/DSLScript.dsl
+++ /dev/null
@@ -1,2 +0,0 @@
-goop
-gloop
\ No newline at end of file
diff --git a/kiss/src/test/cases/DSLTestCase.hx b/kiss/src/test/cases/DSLTestCase.hx
deleted file mode 100644
index abfa4fb9..00000000
--- a/kiss/src/test/cases/DSLTestCase.hx
+++ /dev/null
@@ -1,19 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.EmbeddedScript;
-import kiss.Prelude;
-
-class DSLTestCase extends Test {
-    function testScript() {
-        new DSLScript().run();
-    }
-
-    function testFork() {
-        new DSLScript().fork([(self) -> Assert.equals(5, 5), (self) -> Assert.equals(7, 7)]);
-    }
-}
-
-@:build(kiss.EmbeddedScript.build("DSL.kiss", "DSLScript.dsl"))
-class DSLScript extends EmbeddedScript {}
diff --git a/kiss/src/test/cases/ExternTestCase.hx b/kiss/src/test/cases/ExternTestCase.hx
deleted file mode 100644
index 220d9090..00000000
--- a/kiss/src/test/cases/ExternTestCase.hx
+++ /dev/null
@@ -1,21 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.CompilerTools;
-import kiss.Prelude;
-
-@:build(kiss.Kiss.build())
-class ExternTestCase extends Test {
-    // Skip these tests on C# for now because they will fail due to this haxe bug:
-    // https://github.com/HaxeFoundation/haxe/issues/10332
-    #if ((sys || hxnodejs) && !cs)
-    function testExternPython() {
-        _testExternPython();
-    }
-
-    function testExternJavaScript() {
-        _testExternJavaScript();
-    }
-    #end
-}
diff --git a/kiss/src/test/cases/ExternTestCase.kiss b/kiss/src/test/cases/ExternTestCase.kiss
deleted file mode 100644
index b334168d..00000000
--- a/kiss/src/test/cases/ExternTestCase.kiss
+++ /dev/null
@@ -1,13 +0,0 @@
-// Skip these tests on C# for now because they will fail due to this haxe bug:
-// https://github.com/HaxeFoundation/haxe/issues/10332
-(#unless cs
-(function _testExternPython []
-    (Assert.isTrue
-        (#extern Bool python [:String passingString "Hello python!"]
-            (python.NativeStringTools.startswith passingString "Hello"))))
-
-(function _testExternJavaScript []
-    (Assert.equals 18
-        (let [jsToEval "5+6+7"]
-            (#extern Int js [:String jsToEval _]
-                (js.Lib.eval jsToEval))))))
\ No newline at end of file
diff --git a/kiss/src/test/cases/GenerativeTestCase.hx b/kiss/src/test/cases/GenerativeTestCase.hx
deleted file mode 100644
index 695ddc86..00000000
--- a/kiss/src/test/cases/GenerativeTestCase.hx
+++ /dev/null
@@ -1,17 +0,0 @@
-package test.cases;
-
-import kiss.Prelude;
-import kiss.List;
-import utest.Test;
-import utest.Assert;
-
-@:build(kiss.Kiss.build())
-class GenerativeTestCase extends Test {
-    function testTruthy() {
-        _testTruthy();
-    }
-
-    function testFalsy() {
-        _testFalsy();
-    }
-}
diff --git a/kiss/src/test/cases/GenerativeTestCase.kiss b/kiss/src/test/cases/GenerativeTestCase.kiss
deleted file mode 100644
index ceb8901e..00000000
--- a/kiss/src/test/cases/GenerativeTestCase.kiss
+++ /dev/null
@@ -1,90 +0,0 @@
-(defMacroVar maxInt 1000000000)
-(defMacroVar maxStringLength 20)
-(defMacroVar maxExps 4)
-(defMacroVar maxDepth 13)
-
-(defAlias &ident nd (+ 1 macroDepth))
-
-(defMacroFunction _macroList [func length]
-    (for _ (range length) (func)))
-
-(defMacro macroRepeat [exp length]
-    `(begin ,@(_macroList ->{exp} (eval length))))
-
-(defMacroFunction _randomLengthMacroList [func]
-    (_macroList func (+ 2 (random (- maxExps 2)))))
-
-(defMacroFunction _randomLetterString []
-    (ReaderExp.StrExp
-        (apply +
-            (for _ (range (+ 1 (random (- maxStringLength 1))))
-                (chooseRandom (.split "abcdefghijklmnopqrstuvwxyz" ""))))))
-
-(defMacroFunction _randomInt []
-    (symbol (Std.string (random maxInt))))
-
-(defMacroFunction _randomFloat []
-    (symbol (Std.string (+ (random maxInt) (/ 1 (random maxInt))))))
-
-(defMacroFunction _randomFalsyExp [macroDepth]
-    ((chooseRandom
-        (concat
-            [
-                // null in conditionals is problematic in C#
-                (#if !cs ->{`null} ->{`false})
-                ->{`false}
-                ->{`""}
-                ->{`[]}
-            ]
-            (if (< macroDepth maxDepth)
-                    [
-                        ->{`(or ,@(_randomLengthMacroList ->(_randomFalsyExp nd)))}
-                        ->{`(and
-                                ,@(_randomLengthMacroList ->(_randomUncertainExp nd))
-                                ,(_randomFalsyExp nd)
-                                ,@(_randomLengthMacroList ->(_randomUncertainExp nd)))}
-                    ]
-                [])))))
-(defMacro randomFalsyExp []
-    (printExp (_randomFalsyExp 0) "Falsy"))
-
-(defMacroFunction _randomTruthyExp [macroDepth]
-    ((chooseRandom
-        (concat
-            [
-                ->{`true}
-                ->(_randomLetterString)
-                ->(_randomInt)
-                ->(_randomFloat)
-            ]
-            (if (< macroDepth maxDepth)
-                    [
-                        ->{`[,@(_randomLengthMacroList _randomLetterString)]}
-                        ->{`[,@(_randomLengthMacroList _randomInt)]}
-                        ->{`[,@(_randomLengthMacroList _randomFloat)]}
-                        ->{`(and ,@(_randomLengthMacroList ->(_randomTruthyExp nd)))}
-                        ->{`(or 
-                                ,@(_randomLengthMacroList ->(_randomUncertainExp nd))
-                                ,(_randomTruthyExp nd)
-                                ,@(_randomLengthMacroList ->(_randomUncertainExp nd)))}
-                    ]
-                [])))))
-(defMacro randomTruthyExp []
-    (printExp (_randomTruthyExp 0) "Truthy"))
-
-(defMacroFunction _randomUncertainExp [macroDepth]
-    ((chooseRandom
-        [
-            ->(_randomFalsyExp macroDepth)
-            ->(_randomTruthyExp macroDepth)
-        ])))
-
-(function _testTruthy []
-    // Expressions that have failed in the past:
-    (Assert.isTrue ?(or false (and 642565506 905012177) "vaxricnakvc" [431724544 383128908 868813810] 169132392 "" ["ftmlkbdx" "vdaziji" "zm"]))
-    // 10 new expressions:
-    (macroRepeat (Assert.isTrue ?(randomTruthyExp)) 10))
-
-(function _testFalsy []
-    // 10 new expressions:
-    (macroRepeat (Assert.isFalse ?(randomFalsyExp)) 10))
\ No newline at end of file
diff --git a/kiss/src/test/cases/ListEatingTestCase.hx b/kiss/src/test/cases/ListEatingTestCase.hx
deleted file mode 100644
index 10282603..00000000
--- a/kiss/src/test/cases/ListEatingTestCase.hx
+++ /dev/null
@@ -1,12 +0,0 @@
-package test.cases;
-
-import utest.Assert;
-import utest.Test;
-import kiss.Prelude;
-
-@:build(kiss.Kiss.build())
-class ListEatingTestCase extends Test {
-    function testListEating() {
-        _testListEating();
-    }
-}
diff --git a/kiss/src/test/cases/ListEatingTestCase.kiss b/kiss/src/test/cases/ListEatingTestCase.kiss
deleted file mode 100644
index 7a7ff288..00000000
--- a/kiss/src/test/cases/ListEatingTestCase.kiss
+++ /dev/null
@@ -1,32 +0,0 @@
-(function _testListEating []
-    // TODO document that list-eating only works on explictly Array-typed variables
-    (let [:Array<Int> l [1 2 3 4]]
-        (case l
-            ([::a b ... c d]
-                (Assert.fail))
-            ([a b c d]
-                (Assert.pass))
-            (otherwise
-                (Assert.fail)))
-        
-        (case l
-            ([::a ...rest]
-                (Assert.equals 1 a)
-                (Assert.equals (.toString [2 3 4]) (.toString rest)))
-            (otherwise
-                (Assert.fail)))
-        
-        (case l
-            ([::a ...rest b]
-                (Assert.equals 1 a)
-                (Assert.equals (.toString [2 3]) (.toString rest))
-                (Assert.equals 4 b))
-            (otherwise
-                (Assert.fail)))
-
-        (case l
-            ([::...rest last]
-                (Assert.equals (.toString [1 2 3]) (.toString rest))
-                (Assert.equals 4 last))
-            (otherwise
-                (Assert.fail)))))
diff --git a/kiss/src/test/cases/MacroTestCase.hx b/kiss/src/test/cases/MacroTestCase.hx
deleted file mode 100644
index f4985e26..00000000
--- a/kiss/src/test/cases/MacroTestCase.hx
+++ /dev/null
@@ -1,60 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.Prelude;
-import kiss.List;
-import haxe.ds.Option;
-
-using StringTools;
-
-@:build(kiss.Kiss.build())
-class MacroTestCase extends Test {
-    function testMultipleFieldForms() {
-        Assert.equals(5, myVar);
-        Assert.equals(6, myFunc());
-    }
-
-    function testExpandList() {
-        Assert.equals(6, sum1());
-        Assert.equals(6, sum2());
-    }
-
-    function testModularMacros() {
-        Assert.equals("Nat 5", nameAndNumber("Nat", 5));
-    }
-
-    function testUndefAlias() {
-        Assert.equals(9, chooseRandom);
-        Assert.equals(6, print(5));
-        Assert.equals(9, aliasValue());
-    }
-
-    function testUndefMacro() {
-        Assert.equals(11, andValue());
-    }
-
-    function testRecursiveMacroFunction() {
-        _testRecursiveMacroFunction();
-    }
-
-    function testPrintAtMacroTime() {
-        _testPrintAtMacroTime();
-    }
-
-    function testSetMacroVar() {
-        _testSetMacroVar();
-    }
-
-    function testRedefineMacroVar() {
-        _testRedefineMacroVar();
-    }
-
-    function testTryCatchWithoutDynamic () {
-        _testTryCatchWithoutDynamic();
-    }
-
-    function testAssertReturnsValue () {
-        _testAssertReturnsValue();
-    }
-}
diff --git a/kiss/src/test/cases/MacroTestCase.kiss b/kiss/src/test/cases/MacroTestCase.kiss
deleted file mode 100644
index 872cb926..00000000
--- a/kiss/src/test/cases/MacroTestCase.kiss
+++ /dev/null
@@ -1,122 +0,0 @@
-(defMacro defMultiple [varName funcName]
-    `{
-        (var ,varName 5)
-        (function ,funcName [] 6)})
-
-(defMultiple myVar myFunc)
-
-(defMacro variadicPlus [&rest l]
-    `(+ ,@l))
-(defMacro listPlus [l]
-    `(+ ,@l))
-
-// Both forms of passing expression lists to macros should work:
-(function sum1 [] (variadicPlus 1 2 3))
-(function sum2 [] (listPlus [1 2 3]))
-
-// You should be able to run list comprehensions on expressions
-// and put the pieces back together in a modular way
-(defMacro altDefun [name args &body body]
-    (let [argPairs
-                (groups (expList args) 2)
-            untypedArgs
-                []
-            letBindings
-                []]
-        (doFor [name type] argPairs
-            (untypedArgs.push name)
-            (letBindings.push name)
-            // (print type)
-            // (print name)
-            (letBindings.push `(the ,type ,name)))
-        (print letBindings)
-        `(function ,name ,untypedArgs
-            (let ,letBindings ,@body))))
-
-(altDefun nameAndNumber [name String number Int]
-    "$name $number")
-
-
-(defMacro listOfExp [exp times]
-    (let [times (eval times)]
-        (_listOfExp exp times)))
-
-(defMacroFunction _listOfExp [exp times]
-    (case times
-        (1 `[,exp])
-        (otherwise `(.concat ,(_listOfExp exp 1) ,(_listOfExp exp (- times 1))))))
-
-(function _testRecursiveMacroFunction []
-    (Assert.equals (Std.string [10 10 10 10 10 10 10 10 10 10]) (Std.string (listOfExp 10 10))))
-
-(defMacroFunction printAtMacroTime []
-    ~"Print at macro time should work just fine"
-    `null)
-
-(defMacro _testPrintAtMacroTimeMacro []
-    (printAtMacroTime))
-
-(function _testPrintAtMacroTime []
-    (_testPrintAtMacroTimeMacro)
-    (Assert.pass))
-
-// Calling (set) on a macroVar is a faux-pas, because (setMacroVar) is the right way
-(defMacroVar count 0)
-(defMacro _testSetMacroVarMacro [&builder b]
-    (assertThrows (set count (+ count 1)))
-    (b.str (Std.string count)))
-
-(function _testSetMacroVar []
-    (_testSetMacroVarMacro)
-    (Assert.pass))
-
-(defMacro _testRedefineMacroVarMacro []
-    (setMacroVar count (+ count 1))
-    (symbol (Std.string count)))
-
-(function _testRedefineMacroVar []
-    (Assert.equals 1 (_testRedefineMacroVarMacro))
-    (Assert.equals 2 (_testRedefineMacroVarMacro)))
-
-
-// ifLet and its derivatives should be disabled in defMacro bodies:
-(defMacro _testIfLetDisabledMacro []
-    (assertThrows (ifLet [a "b"] a))
-    (assertThrows (whenLet [a "b"] a))
-    (assertThrows (unlessLet [a "b"] a))
-    `null)
-
-(function _testIfLetDisabled []
-    (_testIfLetDisabledMacro))
-
-(defMacro _testTryCatchWithoutDynamicMacro []
-    (try (throw "intended") (catch [e] (ReaderExp.StrExp e))))
-
-(function _testTryCatchWithoutDynamic []
-    (Assert.equals "intended" (_testTryCatchWithoutDynamicMacro)))
-
-(function _testAssertReturnsValue []
-    (Assert.equals true (assert true)))
-
-
-// DANGEROUS tests:
-
-// (don't add new tests below here, because these tests redefine important forms)
-
-// If for whatever reason, you wanted to make a variable with the name of a built-in identifier alias:
-(undefAlias &ident chooseRandom)
-(var chooseRandom 9)
-
-// Also if you want a function called print:
-(undefAlias &call print)
-(function print [thing] (+ 1 thing))
-
-(defAlias &ident alias 5)
-(undefAlias &ident alias)
-(var alias 9)
-(function aliasValue [] alias)
-
-// If for whatever reason, you wanted to make a function called and
-(undefMacro and)
-(function and [a b] (+ a b))
-(function andValue [] (and 5 6))
\ No newline at end of file
diff --git a/kiss/src/test/cases/OnceTestCase.hx b/kiss/src/test/cases/OnceTestCase.hx
deleted file mode 100644
index 26c3b584..00000000
--- a/kiss/src/test/cases/OnceTestCase.hx
+++ /dev/null
@@ -1,17 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.Prelude;
-
-class OnceTestCase extends Test {
-    function testOnce() {
-        new OnceTestObject();
-        new OnceTestObject();
-        Assert.equals(1, OnceTestObject.staticCount);
-        Assert.equals(2, OnceTestObject.instanceCount);
-    }
-}
-
-@:build(kiss.Kiss.build("OnceTestObject.kiss"))
-class OnceTestObject {}
diff --git a/kiss/src/test/cases/OnceTestObject.kiss b/kiss/src/test/cases/OnceTestObject.kiss
deleted file mode 100644
index 3acc18e7..00000000
--- a/kiss/src/test/cases/OnceTestObject.kiss
+++ /dev/null
@@ -1,8 +0,0 @@
-(var &mut staticCount 0)
-(var &mut instanceCount 0)
-
-(method new []
-    (once
-        (+= staticCount 1))
-    (oncePerInstance
-        (+= instanceCount 1)))
diff --git a/kiss/src/test/cases/ReaderMacroTestCase.hx b/kiss/src/test/cases/ReaderMacroTestCase.hx
deleted file mode 100644
index b31be014..00000000
--- a/kiss/src/test/cases/ReaderMacroTestCase.hx
+++ /dev/null
@@ -1,29 +0,0 @@
-package test.cases;
-
-import utest.Test;
-import utest.Assert;
-import kiss.Prelude;
-
-@:build(kiss.Kiss.build())
-class ReaderMacroTestCase extends Test {
-    function testReadBang() {
-        Assert.equals("String that takes the rest of the line", ReaderMacroTestCase.myLine());
-    }
-
-    function testReadNot() {
-        Assert.isTrue(ReaderMacroTestCase.myBool());
-    }
-
-    function testDefAlias() {
-        Assert.equals(9, ReaderMacroTestCase.mySum);
-    }
-
-    function testMultipleInitiators() {
-        Assert.equals("b", ReaderMacroTestCase.str1);
-        Assert.equals("c", ReaderMacroTestCase.str2);
-    }
-
-    function testQuasiquoteMacro() {
-        _testQuasiquoteMacro();
-    }
-}
diff --git a/kiss/src/test/cases/ReaderMacroTestCase.kiss b/kiss/src/test/cases/ReaderMacroTestCase.kiss
deleted file mode 100644
index e0b8a3c2..00000000
--- a/kiss/src/test/cases/ReaderMacroTestCase.kiss
+++ /dev/null
@@ -1,42 +0,0 @@
-(defReaderMacro &start "!" [stream] 
-    (let [line (stream.expect "a string line" (lambda [] (stream.takeLine)))]
-        (ReaderExp.StrExp line)))
-
-(function myLine []
-    !String that takes the rest of the line
-    )
-
-(function myBool []
-    (begin !false))
-
-(defAlias &call pluppers +)
-(defAlias &ident fluffers 5)
-(defAlias &ident buffers 4)
-
-(var mySum (pluppers fluffers buffers))
-
-// Read b c directly as strings
-(defReaderMacro ["b" "c"] [stream] #{ReaderExp.StrExp(stream.expect("b, or c", function () stream.takeChars(1)));}#)
-
-(var str1 b)
-(var str2 c)
-
-// rassert asserts the next expression without parens
-(defReaderMacro "rassert" [stream] `(assert ,(read stream)))
-
-(function _testQuasiquoteMacro []
-    rassert [5]
-    rassert b
-    rassert fluffers
-    (Assert.pass))
-
-(function _testCommentAtBlockOrArrayEnd []
-    [
-        (+ 1 2)
-        // Comment
-    ]
-    {
-        (+ 1 2)
-        // Comment
-    }
-    (Assert.pass))
diff --git a/kiss/src/test/files/package.json b/kiss/src/test/files/package.json
deleted file mode 100644
index ffb25c36..00000000
--- a/kiss/src/test/files/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "helloworldextern",
-    "version": "1.0.0",
-    "dependencies": {
-        "phaser": "3.55.2"
-    }
-}
diff --git a/kiss/src/test/files/requirements.txt b/kiss/src/test/files/requirements.txt
deleted file mode 100644
index 663bd1f6..00000000
--- a/kiss/src/test/files/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-requests
\ No newline at end of file
diff --git a/kiss/src/test/files/setup.py b/kiss/src/test/files/setup.py
deleted file mode 100644
index ab18e687..00000000
--- a/kiss/src/test/files/setup.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from distutils.core import setup
-
-setup(name='HelloWorld',
-      version='1.0',
-      description='HelloWorld python extern program',
-      author='Nat',
-      author_email='natquaylenelson@gmail.com',
-      url='https://github.com/NQNStudios/kisslang',
-      install_requires=[
-          'requests',
-      ],
-     )
\ No newline at end of file
diff --git a/kiss/template/build.hxml b/kiss/template/build.hxml
deleted file mode 100644
index 6e9b3b61..00000000
--- a/kiss/template/build.hxml
+++ /dev/null
@@ -1,4 +0,0 @@
--lib kiss
--cp src
---main template.Main
---interp
\ No newline at end of file
diff --git a/kiss/template/haxelib.json b/kiss/template/haxelib.json
deleted file mode 100644
index 2f805a7a..00000000
--- a/kiss/template/haxelib.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "template",
-    "url": "https://github.com/NQNStudios/kisslang",
-    "license": "LGPL",
-    "tags": [],
-    "description": "",
-    "version": "0.0.0",
-    "releasenote": "",
-    "contributors": ["NQNStudios"],
-    "classPath": "src/",
-    "main": "template.Main",
-    "dependencies": {
-        "kiss": ""
-    }
-}
\ No newline at end of file
diff --git a/kiss/template/src/template/Main.hx b/kiss/template/src/template/Main.hx
deleted file mode 100644
index ca03cca4..00000000
--- a/kiss/template/src/template/Main.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package template;
-
-class Main {
-    static function main() {
-        Main_.main();
-    }
-}
diff --git a/kiss/template/src/template/Main_.kiss b/kiss/template/src/template/Main_.kiss
deleted file mode 100644
index d441299f..00000000
--- a/kiss/template/src/template/Main_.kiss
+++ /dev/null
@@ -1 +0,0 @@
-(print "Hello world!")
diff --git a/kiss/template/test.sh b/kiss/template/test.sh
deleted file mode 100755
index 0ee8ae95..00000000
--- a/kiss/template/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-haxe build.hxml
\ No newline at end of file
diff --git a/projects/nat-archive-tool/.gitignore b/projects/nat-archive-tool/.gitignore
deleted file mode 100644
index 940719b0..00000000
--- a/projects/nat-archive-tool/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/
-externLog.txt
\ No newline at end of file
diff --git a/projects/nat-archive-tool/LICENSE b/projects/nat-archive-tool/LICENSE
deleted file mode 100644
index 8000a6fa..00000000
--- a/projects/nat-archive-tool/LICENSE
+++ /dev/null
@@ -1,504 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-    USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random
-  Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/projects/nat-archive-tool/apps/autostepper/AutoStepper.jar b/projects/nat-archive-tool/apps/autostepper/AutoStepper.jar
deleted file mode 100644
index 13090886..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/AutoStepper.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/LICENSE.md b/projects/nat-archive-tool/apps/autostepper/LICENSE.md
deleted file mode 100644
index 99bb8c8c..00000000
--- a/projects/nat-archive-tool/apps/autostepper/LICENSE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-** LICENSING: Modified MIT license to restrict commercial use & require attribution **
-
-Copyright (c) 2018 Phr00t's Software
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software with only commercial use restrictions & a requirement to attribute Phr00t's Software. You are free to to use, copy, modify, merge, publish, distribute this Software for private, personal & non-commercial uses as long as Phr00t's Software is attributed.
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/jl1.0.1.jar b/projects/nat-archive-tool/apps/autostepper/lib/jl1.0.1.jar
deleted file mode 100644
index bb6b623f..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/jl1.0.1.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/jsoup-1.11.2.jar b/projects/nat-archive-tool/apps/autostepper/lib/jsoup-1.11.2.jar
deleted file mode 100644
index e4be2aed..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/jsoup-1.11.2.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/mp3spi1.9.5.jar b/projects/nat-archive-tool/apps/autostepper/lib/mp3spi1.9.5.jar
deleted file mode 100644
index 0c74daeb..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/mp3spi1.9.5.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/tritonus_aos.jar b/projects/nat-archive-tool/apps/autostepper/lib/tritonus_aos.jar
deleted file mode 100644
index 4a02386d..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/tritonus_aos.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/tritonus_share.jar b/projects/nat-archive-tool/apps/autostepper/lib/tritonus_share.jar
deleted file mode 100644
index bb367d17..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/tritonus_share.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/apps/autostepper/lib/trove-3.0.3.jar b/projects/nat-archive-tool/apps/autostepper/lib/trove-3.0.3.jar
deleted file mode 100644
index cd00f93e..00000000
Binary files a/projects/nat-archive-tool/apps/autostepper/lib/trove-3.0.3.jar and /dev/null differ
diff --git a/projects/nat-archive-tool/cli.hxml b/projects/nat-archive-tool/cli.hxml
deleted file mode 100644
index def0f7ac..00000000
--- a/projects/nat-archive-tool/cli.hxml
+++ /dev/null
@@ -1,8 +0,0 @@
--lib kiss
--lib uuid
--lib tink_macro
--lib tink_json
--lib requests-externs
--cp src
---main nat.CLI
---interp
\ No newline at end of file
diff --git a/projects/nat-archive-tool/cpp.hxml b/projects/nat-archive-tool/cpp.hxml
deleted file mode 100644
index bf05a322..00000000
--- a/projects/nat-archive-tool/cpp.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--lib hxcpp
---cpp bin/cpp
---cmd bash test-cpp.sh 
\ No newline at end of file
diff --git a/projects/nat-archive-tool/extern-files/js/args.hxml b/projects/nat-archive-tool/extern-files/js/args.hxml
deleted file mode 100644
index af94312d..00000000
--- a/projects/nat-archive-tool/extern-files/js/args.hxml
+++ /dev/null
@@ -1 +0,0 @@
--lib remarkable-typescript
\ No newline at end of file
diff --git a/projects/nat-archive-tool/extern-files/js/package.json b/projects/nat-archive-tool/extern-files/js/package.json
deleted file mode 100644
index 74e23e05..00000000
--- a/projects/nat-archive-tool/extern-files/js/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "nat-archive-tool-js-externs",
-  "version": "0.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "postinstall": "dts2hx --all"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NQNStudios/kisslang.git"
-  },
-  "author": "NQNStudios",
-  "license": "LGPL2",
-  "bugs": {
-    "url": "https://github.com/NQNStudios/kisslang/issues"
-  },
-  "homepage": "https://github.com/NQNStudios/kisslang#readme",
-  "devDependencies": {
-    "dts2hx": "^0.16.1",
-    "remarkable-typescript": "^1.1.3"
-  }
-}
diff --git a/projects/nat-archive-tool/extern-files/python/args.hxml b/projects/nat-archive-tool/extern-files/python/args.hxml
deleted file mode 100644
index c52a3eba..00000000
--- a/projects/nat-archive-tool/extern-files/python/args.hxml
+++ /dev/null
@@ -1 +0,0 @@
--lib requests-externs
\ No newline at end of file
diff --git a/projects/nat-archive-tool/extern-files/python/import.hx b/projects/nat-archive-tool/extern-files/python/import.hx
deleted file mode 100644
index ee370a3e..00000000
--- a/projects/nat-archive-tool/extern-files/python/import.hx
+++ /dev/null
@@ -1 +0,0 @@
-import requests_externs.Requests;
diff --git a/projects/nat-archive-tool/extern-files/python/requirements.txt b/projects/nat-archive-tool/extern-files/python/requirements.txt
deleted file mode 100644
index 4f5b8993..00000000
--- a/projects/nat-archive-tool/extern-files/python/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-requests==2.26.0
\ No newline at end of file
diff --git a/projects/nat-archive-tool/haxelib.json b/projects/nat-archive-tool/haxelib.json
deleted file mode 100644
index c065b6db..00000000
--- a/projects/nat-archive-tool/haxelib.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "name": "nat-archive-tool",
-    "url": "https://github.com/NQNStudios/kisslang",
-    "license": "LGPL",
-    "tags": ["cross"],
-    "description": "",
-    "version": "0.0.0",
-    "releasenote": "It isn't safe to use this library yet.",
-    "contributors": ["NQNStudios"],
-    "classPath": "src/",
-    "main": "nat.CLI",
-    "dependencies": {
-        "kiss": "",
-        "kiss-tools": "",
-        "tink_json": ""
-    }
-}
\ No newline at end of file
diff --git a/projects/nat-archive-tool/js.hxml b/projects/nat-archive-tool/js.hxml
deleted file mode 100644
index 71376d15..00000000
--- a/projects/nat-archive-tool/js.hxml
+++ /dev/null
@@ -1,3 +0,0 @@
--lib hxnodejs
---js bin/js/main.js
---cmd node bin/js/main.js 
\ No newline at end of file
diff --git a/projects/nat-archive-tool/py.hxml b/projects/nat-archive-tool/py.hxml
deleted file mode 100644
index de2e0fff..00000000
--- a/projects/nat-archive-tool/py.hxml
+++ /dev/null
@@ -1,2 +0,0 @@
---python bin/python/main.py
---cmd python bin/python/main.py 
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/Archive.hx b/projects/nat-archive-tool/src/nat/Archive.hx
deleted file mode 100644
index 2fcac77a..00000000
--- a/projects/nat-archive-tool/src/nat/Archive.hx
+++ /dev/null
@@ -1,13 +0,0 @@
-package nat;
-
-import sys.FileSystem;
-import kiss.Prelude;
-import sys.io.File;
-import uuid.Uuid;
-import haxe.DynamicAccess;
-import haxe.ds.Option;
-
-using haxe.io.Path;
-
-@:build(kiss.Kiss.build())
-class Archive {}
diff --git a/projects/nat-archive-tool/src/nat/Archive.kiss b/projects/nat-archive-tool/src/nat/Archive.kiss
deleted file mode 100644
index 97b6b1e4..00000000
--- a/projects/nat-archive-tool/src/nat/Archive.kiss
+++ /dev/null
@@ -1,111 +0,0 @@
-(defNew [&prop :String archiveDir]
-
-    [:Array<System> systems
-            []
-        :Option<String> gitDir
-            (let [gitDir (joinPath archiveDir ".git")]
-                (if (FileSystem.exists gitDir)
-                        (Some gitDir)
-                    None))
-        // Parse all entries into a dictionary of id => entry
-        :Map<String,Entry> entries
-            (let [entryDir (joinPath archiveDir "entries")
-                    filesDir (joinPath archiveDir "files")]
-                (assert (FileSystem.exists archiveDir) "Archive directory $archiveDir does not exist")
-                (assert (FileSystem.isDirectory archiveDir) "$archiveDir is not a directory")
-                (FileSystem.createDirectory entryDir)
-                (FileSystem.createDirectory filesDir)
-                
-                // Sync with git if the archive is a repository:
-                (whenLet [(Some gitDir) gitDir]
-                    (assertProcess "git" ["pull"] [] true archiveDir))
-
-                (let [entryFiles (FileSystem.readDirectory entryDir)]
-                    (for file entryFiles
-                        =>(file.withoutExtension)
-                        (the Entry (tink.Json.parse (File.getContent (joinPath archiveDir "entries" file)))))))
-        :DynamicAccess<Dynamic> playgrounds
-            (let [playgroundsFile (joinPath archiveDir "playgrounds.json")]
-                (unless (FileSystem.exists playgroundsFile)
-                    (File.saveContent playgroundsFile
-#"{
-	"default": "Playground-MAIN",
-	"Playground-MAIN": {
-		"catsMatch": "true"
-	}
-}
-"#))
-                (haxe.Json.parse (File.getContent playgroundsFile)))])
-
-(method changePlaygrounds [:Dynamic->Void change]
-    (change playgrounds)
-    (File.saveContent (joinPath archiveDir "playgrounds.json") (haxe.Json.stringify playgrounds "\t"))
-    (gitSync))
-
-(method :String currentPlayground []
-    (dictGet playgrounds "default"))
-
-(method addSystem [:System system]
-    (systems.push system)
-    system)
-
-(method addAndProcessSystem [:System system &opt :ArchiveUI ui]
-    (addSystem system)
-    (refreshSystem system)
-    (system.process this ui)
-    system)
-
-(method refreshSystem [:System system]
-    (doFor =>id e entries
-        (system.checkEntryInOrOut this e)))
-
-(method forceProcessAll [&opt :ArchiveUI ui]
-    (doFor system systems (refreshSystem system))
-    (processSystems))
-
-(method processSystems [&opt :ArchiveUI ui]
-    (doFor system systems 
-        (system.process this ui)))
-
-(prop &mut :Entry->Dynamic defaultInitializer null)
-
-(method :Entry createEntry [:Entry->Dynamic initializer] // initializer returns Dynamic so ->:Void isn't required
-    (let [e (new Entry)]
-        (when defaultInitializer
-            (defaultInitializer e))
-        (initializer e)
-        (dictSet entries e.id e)
-        (refreshEntry e)
-        e))
-
-// After modifying an entry, this must be called. If you are writing in a createEntry
-// initializer or a system's processEntry function, this will happen automatically.
-// Also most functions that only affect the Entry, not its components' contents,
-// will call this automatically though (withWritableEntry).
-// When changing components, use the (withWritableComponents) macro in Lib.kiss
-(method refreshEntry [:Entry e]
-    (_saveEntry e)
-    (doFor system systems
-        (system.checkEntryInOrOut this e)))
-
-(method gitSync []
-    // Sync with git if the archive is a repository:
-    (whenLet [(Some gitDir) gitDir
-                gitDo ->gitArgs (assertProcess "git" gitArgs [] true archiveDir)]
-        (gitDo ["add" "playgrounds.json"])
-        (gitDo ["add" "entries"])
-        (gitDo ["add" "files"])
-        (gitDo ["commit" "--no-verify" "--allow-empty" "-m" "$(Date.now)"])
-        (gitDo ["push"])))
-
-(method _saveEntry [:Entry e]
-    (File.saveContent
-        (joinPath archiveDir "entries" (e.id.withExtension "json"))
-        (tink.Json.stringify e))
-    (gitSync))
-
-(method fullString [:Entry e]
-    (haxe.Json.stringify e null "\t"))
-
-(method :String filePath [file]
-    (joinPath archiveDir "files" file))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.hx b/projects/nat-archive-tool/src/nat/ArchiveController.hx
deleted file mode 100644
index fc37c4d2..00000000
--- a/projects/nat-archive-tool/src/nat/ArchiveController.hx
+++ /dev/null
@@ -1,56 +0,0 @@
-package nat;
-
-import kiss.Prelude;
-import kiss.List;
-import kiss.Stream;
-import nat.components.Position;
-import haxe.Constraints;
-import haxe.DynamicAccess;
-import uuid.Uuid;
-import nat.systems.*;
-import nat.components.*;
-
-enum CommandArgType {
-    // When called interactively, automatically pass the currently selected Entry(s) to the function
-    // TODO eventually these will also be passed automatically when called programatically
-    SelectedEntry;
-    SelectedEntries(min:Null<Int>, max:Null<Int>);
-    // String input
-    Text(maxLength:Null<Float>); // max length is a float so Math.POSITIVE_INFINITY can be used
-    // Any number of string inputs:
-    VarText(maxLength:Null<Float>);
-    // Numerical input, can be forced to align with a fixed step from the minimum
-    Number(min:Null<Float>, max:Null<Float>, inStepsOf:Null<Float>);
-    // Any number of numerical inputs, can be forced to align with a fixed step from the minimum
-    Numbers(min:Null<Float>, max:Null<Float>, inStepsOf:Null<Float>);
-    // Make the user select Entry(s) when called interactively
-    OneEntry; // This constructor must be disambiguated from the typedef "Entry"
-    Entries(min:Null<Int>, max:Null<Int>);
-    
-    TagsFromAll;
-    TagsFromSelected;
-
-    // TODO File
-    // TODO Files
-
-    Position;
-    
-    // Then again the more of these I add the more convoluted CollectAndValidateArgs gets,
-    // and the more stream reader methods I need to write
-}
-
-typedef CommandArg = {
-    name:String,
-    type:CommandArgType
-};
-
-typedef Command = {
-    args:Array<CommandArg>,
-    handler:Function
-    // Command handlers need to return a ChangeSet
-};
-
-typedef ChangeSet = Array<Entry>;
-
-@:build(kiss.Kiss.build())
-class ArchiveController {}
diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
deleted file mode 100644
index b803b85e..00000000
--- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss
+++ /dev/null
@@ -1,533 +0,0 @@
-(load "Lib.kiss")
-
-(method :Void _collectAndValidateArg [:CommandArg arg :Stream stream :Dynamic->Void continuation]
-    (case arg.type
-        (SelectedEntry
-            (if (= 1 _selectedEntries.length)
-                    (continuation (first (getSelectedEntries)))
-                (ui.reportError "The requested command expects 1 entry to be selected. You have selected: $_selectedEntries.length")))
-        ((SelectedEntries min max)
-            (unless min (set min 0))
-            // TODO might want to optimize this O(n) count operation by pre-calculating it 
-            (unless max (set max (count archive.entries)))
-            (if !(<= min _selectedEntries.length max)
-                    (ui.reportError "The requested command expects between $min and $max entries to be selected. You have selected: $_selectedEntries.length")
-                (continuation (getSelectedEntries))))
-        ((Text maxLength)
-            (unless maxLength (set maxLength Math.POSITIVE_INFINITY))
-            (stream.dropWhitespace)
-            (localFunction :Void trySubmit [text]
-                (stream.dropWhitespace)
-                (if !(<= text.length maxLength)
-                        (ui.reportError "The requested command expected a string up to $maxLength characters long. You entered: $text.length characters")
-                    (continuation text)))
-            (if (or (stream.isEmpty) (stream.dropStringIf "_"))
-                    // If no text argument was pre-supplied, use the ui for it
-                    (ui.enterText
-                        "${arg.name} (up to ${maxLength} characters):"
-                        trySubmit
-                        maxLength)
-                (trySubmit (readString stream))))
-        ((VarText maxLength)
-            (unless maxLength (set maxLength Math.POSITIVE_INFINITY))
-            (stream.dropWhitespace)
-            (let [collectedText []]
-                (localFunction :Void enterTextAgain []
-                    (localFunction :Void trySubmit [text]
-                        (stream.dropWhitespace)
-                        (if !text
-                                (continuation collectedText)
-                            (if !(<= text.length maxLength)
-                                    (ui.reportError "The requested command expected a list of strings up to $maxLength characters long. You entered: $text.length characters")
-                                {(collectedText.push text)
-                                    (enterTextAgain)})))
-
-                    (if (or (stream.isEmpty) (stream.dropStringIf "_"))
-                            // If no vartext argument was pre-supplied, use the ui for it
-                            (ui.enterText
-                                "${arg.name} (up to ${maxLength} characters):"
-                                trySubmit
-                                maxLength)
-                        (trySubmit (readString stream))))
-                (enterTextAgain)))
-        ((or TagsFromAll TagsFromSelected)
-            (chooseFromTags arg.type continuation))
-        ((Number min max inStepsOf)
-            (unless min (set min Math.NEGATIVE_INFINITY))
-            (unless max (set max Math.POSITIVE_INFINITY))
-            (stream.dropWhitespace)
-            (let [&mut prompt "${arg.name} (${min}-${max}"]
-                (when inStepsOf
-                    (+= prompt " in steps of ${inStepsOf}"))
-                (+= prompt "):")
-
-                (localFunction :Void trySubmit [number]
-                    (stream.dropWhitespace)
-                    (let [minMaxError
-                                    "The requested command expected a number between $min and $max"
-                                stepError
-                                    "$minMaxError in steps of $inStepsOf"
-                                youEntered
-                                    ". You entered: $number"]
-                            (if (or
-                                        !(<= min number max)
-                                        (and inStepsOf !(= 0 (% (- number min) inStepsOf))))
-                                    (if inStepsOf
-                                            (ui.reportError "${stepError}$youEntered")
-                                        (ui.reportError "${minMaxError}$youEntered"))
-                                (continuation number))))
-
-                // If no text argument was pre-supplied, use the ui for it
-                (if (or (stream.isEmpty) (stream.dropStringIf "_"))
-                        (ui.enterNumber
-                            prompt
-                            trySubmit
-                            min
-                            max
-                            inStepsOf)
-                    (trySubmit (readNumber stream)))))
-        ((Numbers min max inStepsOf)
-            (unless min (set min Math.NEGATIVE_INFINITY))
-            (unless max (set max Math.POSITIVE_INFINITY))
-            (stream.dropWhitespace)
-            (let [&mut prompt "${arg.name} (${min}-${max}"
-                    collectedNumbers []]
-                (when inStepsOf
-                    (+= prompt " in steps of ${inStepsOf}"))
-                (+= prompt "):")
-                (localFunction :Void enterNumAgain []
-                    (localFunction :Void trySubmit [number]
-                        (stream.dropWhitespace)
-                        (let [minMaxError
-                                    "The requested command expected numbers between $min and $max"
-                                stepError
-                                    "$minMaxError in steps of $inStepsOf"
-                                youEntered
-                                    ". You entered: $number"]
-                            (if (Math.isNaN number)
-                                    (continuation collectedNumbers)
-                                (if (or
-                                            !(<= min number max)
-                                            (and inStepsOf !(= 0 (% (- number min) inStepsOf))))
-                                        (if inStepsOf
-                                                (ui.reportError "${stepError}$youEntered")
-                                            (ui.reportError "${minMaxError}$youEntered"))
-                                    {(collectedNumbers.push number)
-                                        (enterNumAgain)}))))
-
-                    (if (or (stream.isEmpty) (stream.dropStringIf "_"))
-                            // If no vartext argument was pre-supplied, use the ui for it
-                            (ui.enterNumber
-                                prompt
-                                trySubmit
-                                min
-                                max
-                                inStepsOf
-                                true)
-                        (trySubmit (readNumber stream))))
-                (enterNumAgain)))
-        (OneEntry
-            (ui.chooseEntry
-                "${arg.name}:"
-                archive
-                continuation))
-        ((Entries min max)
-            (unless min (set min 1))
-            // TODO might want to optimize this O(n) count operation by pre-calculating it 
-            (unless max (set max (count archive.entries)))
-            (ui.chooseEntries
-                "${arg.name}:"
-                archive
-                (lambda :Void [:Array<Entry> entries]
-                    (if (or
-                                (> min entries.length)
-                                (< max entries.length))
-
-                            (ui.reportError "The requested command expects between $min and $max entries. You chose: $entries.length")
-                    (continuation entries)))
-                min
-                max))
-        (Position
-            (ui.choosePosition "${arg.name}:" continuation))
-        (never null)))
-
-(method :Array<String> allTags [&opt :Array<Entry> entries]
-    (let [:Array<Entry> entries (or entries (collect (archive.entries.iterator)))
-            :Tags tags (new Map)]
-        (doFor e entries
-            (when (hasComponent e Tags)
-                (doFor =>tag _ (readComponent e Tags)
-                    (dictSet tags tag 1))))
-        (sort (collect (tags.keys)))))
-
-(method :Array<String> allSelectedTags []
-    (allTags _selectedEntries))
-
-(method chooseFromTags [:CommandArgType type :Dynamic->Void cc &opt tagsToChooseFrom &opt tagsChosen]
-    (let [tagsToChooseFrom 
-                (or tagsToChooseFrom 
-                    (concat ["CONFIRM"]
-                        (case type 
-                            (TagsFromAll (concat ["DEFINE NEW TAG"] (allTags)))
-                            (TagsFromSelected (allSelectedTags))
-                            (never otherwise))))
-            tagsChosen (or tagsChosen [])]
-        (ui.chooseBetweenStrings
-            "Tags:" 
-            tagsToChooseFrom 
-            ->:Void choice (case choice
-                ("CONFIRM" (cc tagsChosen))
-                ("DEFINE NEW TAG"
-                    (ui.enterText "New tag (must be legal as a haxe var name):"
-                        // TODO check lowercase valid symbol etc.
-                        ->:Void newTag {(tagsChosen.push newTag) (chooseFromTags type cc tagsToChooseFrom tagsChosen)}
-                        Math.POSITIVE_INFINITY))
-                (other
-                    (tagsToChooseFrom.remove other)
-                    (tagsChosen.push other)
-                    (chooseFromTags type cc tagsToChooseFrom tagsChosen))
-                (never null)))))
-
-// TODO try catch and ui.reportError
-// TODO maaaybe support escape sequences?
-(function readString [:Stream stream]
-    (let [terminator
-            (case (stream.takeChars 1)
-                ((Some "\"") "\"")
-                ((Some "'") "'")
-                (otherwise (throw "string arg must start with \" or '")))]
-        (case (stream.takeUntilAndDrop terminator)
-            ((Some s) s)
-            (otherwise (throw "string arg must end with $terminator")))))
-
-// TODO try catch and ui.reportError
-(function readNumber [:Stream stream]
-    (Std.parseFloat (case (stream.takeUntilOneOf [" "] true) ((Some f) f) (otherwise ""))))
-
-(method :Void->Void _composeArgCollector [:Array<Dynamic> collectedArgs :CommandArg arg :Stream stream :Void->Void lastCollector]
-    (lambda :Void []
-        (_collectAndValidateArg arg stream ->:Void [:Dynamic argValue] {(collectedArgs.push argValue) (lastCollector)})))
-
-(method :Void tryRunCommand [:String command &opt :Void->Void doAfter]
-    (let [parts (command.split " ")
-            commandName (parts.shift)
-            stream (Stream.fromString (parts.join " "))
-            lowerCommandName (commandName.toLowerCase)]
-        (if (commands.exists lowerCommandName)
-                (_runCommand (dictGet commands lowerCommandName) stream doAfter)
-            (ui.reportError "$commandName is not a valid command"))))
-
-(method :Void tryRunCommands [:Array<String> commands]
-    (when commands
-        (tryRunCommand (commands.shift) ->:Void (tryRunCommands commands))))
-
-(method :Void _runCommand [:Command command :Stream stream &opt :Void->Void doAfter]
-    (let [collectedArgs
-                []
-            &mut lastCollector
-                (lambda []
-                    (let [result (Reflect.callMethod null command.handler collectedArgs)]
-                        (assert !(Prelude.isNull result) "Command implementation forgot to return a ChangeSet")
-                        (set lastChangeSet (the ChangeSet result))
-                        
-                        (when lastChangeSet
-                            (doFor e lastChangeSet
-                                (assert (and e (isEntry e)) "Lib function forgot to return the Entry that was modified"))
-                            (doFor e lastChangeSet
-                                (archive.refreshEntry e))
-                            (ui.handleChanges archive lastChangeSet)
-                            (archive.processSystems)
-                            (when doAfter (doAfter)))))]
-        // To facilitate asynchronous arg input via UI, we need to construct an insanely complicated nested callback to give the UI
-        (doFor arg (reverse command.args)
-            (set lastCollector (_composeArgCollector collectedArgs arg stream lastCollector)))
-        (lastCollector)))
-
-
-// TODO SelectedEntry and SelectedEntries functions should be stateful and use the actual
-// selected entries automatically
-(defMacro defCommand [name args &body body]
-    (let [argPairs
-                (groups (expList args) 2)
-            methodArgs
-                (for [name type] argPairs
-                    (exprCase type
-                        ((exprOr SelectedEntry OneEntry) `:nat.Entry ,name)
-                        ((exprOr (SelectedEntries _ _) (Entries _ _)) `:Array<nat.Entry> ,name)
-                        ((Text _) `:String ,name)
-                        ((VarText _) `:Array<String> ,name)
-                        (TagsFromAll `:Array<String> ,name)
-                        (TagsFromSelected `:Array<String> ,name)
-                        ((Number _ _ _) `:Float ,name)
-                        ((Numbers _ _ _) `:Array<Float> ,name)
-                        (Position `:Position ,name)))
-            commandArgs
-                (for [name type] argPairs
-                    `(object name ,(symbolName name) type ,type))]
-        `{
-            (method ,name [,@methodArgs] ,@body)
-            // Preserve the capitalization of the command name for pretty help message
-            (commandNames.push ,(symbolName name))
-            // Store the command name without capitalization for forgiving call conventions
-            (dictSet commands ,(ReaderExp.StrExp (.toLowerCase (symbolNameValue name))) (object args [,@commandArgs] handler (the Function ,name)))
-        }))
-
-(var :Array<String> commandNames [])
-
-(method isSelected [:Entry e]
-    !(= -1 (_selectedEntries.indexOf e)))
-
-(method getSelectedEntries []
-    (_selectedEntries.copy))
-
-(prop &mut :PlaygroundSystem<Dynamic> playgroundSystem null)
-
-(method :Void typeCommand []
-    (when ui.shortcutHandler (ui.shortcutHandler.cancel))
-    (ui.enterText
-        "Command:" 
-        ->command
-            (tryRunCommand command)
-        Math.POSITIVE_INFINITY))
-
-// TODO typeShortcut   
-
-(defNew [&prop :Archive archive
-            &prop :ArchiveUI ui]
-    [&mut :Array<Entry> _selectedEntries []
-        &mut :ChangeSet lastChangeSet []
-        :Map<String,Command> commands (new Map)
-        :NameSystem nameSystem (new NameSystem)]
-
-    (set ui.controller this)
-
-    // Add systems!
-    (archive.addAndProcessSystem nameSystem ui)
-    (archive.addSystem (new RemarkableAPISystem))
-    (archive.addSystem (new WikipediaImageSystem))
-    (archive.addSystem (new ImageAttachmentSystem))
-    (archive.addAndProcessSystem (new KeyShortcutSystem this) ui)
-    (archive.addSystem (new DLSystem))
-    (archive.addSystem (new AutoStepperSystem))
-    
-    (localFunction colorEqual [:nat.components.ColorI c1 :nat.components.ColorI c2]
-        (and (= c1.r c2.r) (= c1.g c2.g) (= c1.b c2.b) (= c1.a c2.a)))
-    (localFunction colorsContain [:Array<nat.components.ColorI> cs :nat.components.ColorI c1]
-        (doFor c2 cs
-            (when (colorEqual c2 c1)
-                (return true)))
-        (return false))
-    (localFunction addColorTagSystems [:Map<String,nat.components.ColorI> info]
-        (let [colors (collect (info.iterator))]
-            (doFor =>tagExp color info
-                (archive.addSystem (new TagSystem "ColorTagSystem{${tagExp}}" tagExp ->[archive e &opt ui]
-                    (when (or !(hasComponent e ColorI) (colorsContain colors (readComponent e ColorI)))
-                        (AddColorIRGBA [e] color.r color.g color.b color.a)))))))
-    (addColorTagSystems [
-        // Active: green
-        =>"(or active enabled)" (object r 0 g 255 b 0 a 255)
-        // Inactive: gray
-        =>"(or inactive disabled)" (object r 128 g 128 b 128 a 255)
-        // todo: orange
-        =>"todo" (object r 255 g 128 b 0 a 255)])
-
-    (whenLet [ps (ui.playgroundSystem)]
-        (set playgroundSystem ps)
-        (set ps.setupProcess true)
-        (archive.addAndProcessSystem ps)
-        (ps.switchPlaygroundKey (dictGet archive.playgrounds "default")))
-    
-    (defCommand Help []
-        (ui.displayMessage
-            (+ "Available commands:\n"
-                (commandNames.join "\n"))) [])
-
-    (load "SelectionCommands.kiss")
-
-    (defCommand Rename [e SelectedEntry newName (Text null)]
-        (withWritableComponents archive e [name Name]
-            (set name newName))
-        [e])
-
-    (defCommand PrintSelectedEntries [entries (SelectedEntries 1 null)]
-        (doFor e entries (ui.displayMessage (archive.fullString e))) [])
-    
-    (defCommand PrintComponent [entries (SelectedEntries 1 null)
-                                    componentType (Text null)]
-        (doFor e entries
-            (if (e.components.exists componentType)
-                    (ui.displayMessage (dictGet e.components componentType))
-                (ui.displayMessage "Entry ${e.id} has no $componentType component"))) [])
-        
-    (defCommand RemoveComponent [entries (SelectedEntries 1 null)
-                                    componentType (Text null)]
-        (for e entries
-            (withWritableEntry archive e
-                (e.components.remove componentType)
-                e)))
-        
-    (defCommand CreateEntry [name (Text null)]
-        [(archive.createEntry ->e (addComponent archive e Name name))])
-    
-    (defCommand CreateEntries [names (VarText null)]
-        // createEntry returns a list, so these lists must be flattened
-        (flatten (for name names
-            (CreateEntry name))))
-
-    (defCommand CreateTaggedEntry [tags TagsFromAll name (Text null)]
-        [(archive.createEntry ->e
-            {(addComponent archive e Name name)
-                (addTags archive e tags)})])
-
-    (defCommand CreateTaggedEntries [tags TagsFromAll names (VarText null)]
-        // createEntry returns a list, so these lists must be flattened
-        (flatten (for name names
-            (CreateTaggedEntry tags name))))
-
-    (defCommand CreateCircleEntry [tags (VarText null) radius (Number 0 null null)]
-        [(archive.createEntry ->e
-            {(addTags archive e tags)
-            (addComponent archive e Circle (objectWith radius))})])
-
-    (defCommand AddTags [entries (SelectedEntries 1 null)
-                            tagsToAdd TagsFromAll]
-        (doFor e entries
-            (addTags archive e tagsToAdd))
-        entries) // TODO this includes entries that already had the tag in the changeset
-
-    (defCommand RemoveTags [entries (SelectedEntries 1 null) tagsToRemove TagsFromSelected]
-        (doFor e entries
-            (removeTags archive e tagsToRemove))
-        entries) // TODO this includes entries that didn't have the tag in the changeset
-        
-    (defCommand AddRectangle [entries (SelectedEntries 1 null)
-                                width (Number 0 null null)
-                                height (Number 0 null null)]
-        (doFor e entries
-            (addComponent archive e Rectangle (objectWith width height)))
-        entries)
-
-    (defCommand CreateRectangleEntry [p1 Position p2 Position]
-        [(archive.createEntry ->e
-            (let [x (min p1.x p2.x)
-                    y (min p1.y p2.y)
-                    w (- (max p1.x p2.x) x)
-                    h (- (max p1.y p2.y) y)]
-                (addComponent archive e Positions [=>(archive.currentPlayground) (objectWith [z 0.0] x y)])
-                (addComponent archive e Rectangle (object width w height h))))])
-        
-    (defCommand AddDLURL [e SelectedEntry url (Text null)]
-        [(addComponent archive e DLURL url)])
-
-    (defCommand AddYoutubeMusic [name (Text null) url (Text null)]
-        [(archive.createEntry ->e
-            {(addComponent archive e Name name)
-                (addTags archive e ["music"])
-                (AddDLURL e url)})])
-
-    (defCommand AddKeyShortcut [e SelectedEntry description (Text  null)]
-        (addComponent archive e KeyShortcut description))
-       
-    (defCommand AddNATCommand [e (SelectedEntries null null) command (Text null)]
-        (doFor e e (addComponent archive e NATCommand command)))
-
-    (defCommand AddNATCommands [e (SelectedEntries null null) commands (VarText null)]
-        (doFor e e (addComponent archive e NATCommands commands)))
-
-    (defCommand CreateShortcutEntry [description (Text null) command (Text null)]
-        [(archive.createEntry ->e {
-            (addComponent archive e Name description)
-            (AddKeyShortcut e description)
-            (AddNATCommand [e] command)})])
-
-    (defCommand CreateMultiCommandShortcut [description (Text null) commands (VarText null)]
-        [(archive.createEntry ->e {
-            (addComponent archive e Name description)
-            (AddKeyShortcut e description)
-            (AddNATCommands [e] commands)})])
-
-    (defCommand AddFiles [entries (SelectedEntries 1 null)
-        // TODO add File and Files as an argument type for commands, ArchiveUI
-        // TODO make tkinter file browser externs and use tkinter as the file picking mechanism for CLI
-                                files (VarText null)]
-        (doFor e entries
-            (addFiles archive e files))
-        entries)
-
-    (method adjustImagePins [:Array<Entry> entries increment]
-        (doFor e entries
-            (if (hasComponent e Images2)
-                    (withWritableComponents archive e [images Images2]
-                        (set images.pinnedImageIndex (max 0 (min (- images.imageFiles.length 1) (+ increment images.pinnedImageIndex)))))
-                (ui.reportError "Entry $e has no Images2 component")))
-        entries)
-
-    (defCommand PinNextImage [entries (SelectedEntries 1 null)]
-        (adjustImagePins entries 1))
-
-    (defCommand PinPreviousImage [entries (SelectedEntries 1 null)]
-        (adjustImagePins entries -1))
-
-    (defCommand SetScale [entries (SelectedEntries 1 null) scale (Number 0 null null)]
-        (doFor e entries
-            (cond 
-                ((hasComponent e Images2)
-                    (withWritableComponents archive e [i2 Images2]
-                        (setNth i2.imageScales i2.pinnedImageIndex scale)))
-                ((hasComponent e Scale)
-                        (withWritableComponents archive e [scaleComponent Scale]
-                            (set scaleComponent scale)))
-                (true (addComponent archive e Scale scale))))
-        entries)
-    
-    (defCommand CreatePlayground [name (Text null) catsMatchExp (Text null) defaultTags TagsFromAll]
-        (archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p]
-            (dictSet p name (object catsMatch catsMatchExp)))
-        (let [[e] (CreateTaggedEntry ["playground"] name)]
-            (addComponent archive e CatsMatchExp catsMatchExp)
-            (addComponent archive e TagList defaultTags)
-            [e]))
-    
-    (defCommand SwitchPlayground [name (Text null)]
-        (archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p] (dictSet p "default" name))
-        (SelectEntries [])
-        (when playgroundSystem (playgroundSystem.switchPlaygroundKey name))
-        [])
-
-    (defCommand ChoosePlayground []
-        (ui.chooseBetweenStrings
-            "Choose a playground:"
-            (sort (for =>key _ archive.playgrounds (if (= key "default") (continue) key)))
-            ->pg (SwitchPlayground pg))
-        [])
-        
-    (defCommand AddConnections [entries (SelectedEntries 1 null) entriesToConnect (Entries 1 null)]
-        (for e entries
-            (addConnections archive e entriesToConnect)))
-
-    (defCommand RemoveConnections [entries (SelectedEntries 1 null) entriesToRemove (Entries 1 null)]
-        (for e entries
-            (addConnections archive e entriesToRemove)))
-    
-    (defCommand AddColorFRGBA [entries (SelectedEntries 1 null) r (Number 0 1 null) g (Number 0 1 null) b (Number 0 1 null) a (Number 0 1 null)]
-        (for e entries
-            (addColorFRGBA archive e r g b a)))
-
-    (defCommand AddColorIRGBA [entries (SelectedEntries 1 null) r (Number 0 255 1) g (Number 0 255 1) b (Number 0 255 1) a (Number 0 255 1)]
-        (for e entries
-            (addColorIRGBA archive e (Std.int r) (Std.int g) (Std.int b) (Std.int a))))
-    
-    (defCommand VibeCheck [accounts (Numbers null null null) monthlyExpenses (Numbers null null null) energy (Number 1 10 1) hope (Number 1 10 1) note (Text null)]
-        [(archive.createEntry ->e {
-            (let [nw (apply + accounts)
-                    me (apply + monthlyExpenses)
-                    runway (/ nw me)]
-                (ui.displayMessage "Your net worth is \$$nw")
-                (if (< nw 0)
-                        (ui.displayMessage "You are in debt and spending \$$me per month.")
-                    (ui.displayMessage "It will last for roughly $runway months!")))
-            (addComponent archive e VibeCheck (objectWith [energy (Std.int energy) hope (Std.int hope)] accounts monthlyExpenses note))
-            (addComponent archive e Dates [=>"Created" (Date.now)])
-        })])
-    
-    )
diff --git a/projects/nat-archive-tool/src/nat/ArchiveUI.hx b/projects/nat-archive-tool/src/nat/ArchiveUI.hx
deleted file mode 100644
index 50901d30..00000000
--- a/projects/nat-archive-tool/src/nat/ArchiveUI.hx
+++ /dev/null
@@ -1,83 +0,0 @@
-package nat;
-
-import nat.Entry;
-import nat.ArchiveController;
-import kiss_tools.KeyShortcutHandler;
-import nat.systems.PlaygroundSystem;
-import haxe.ds.Option;
-import nat.components.Position;
-
-interface ArchiveUI {
-    /**
-     * Reference to the ArchiveController
-     */
-    var controller(default, default):ArchiveController;
-
-    /**
-     * A KeyShortcutHandler that will integrate with the KeyShortcutSystem if provided
-     */
-    var shortcutHandler(default, null):Null<KeyShortcutHandler<Entry>>;
-
-    function showPrefixMap(map:Map<String,String>):Void;
-    function hidePrefixMap():Void;
-
-    /**
-     * A PlaygroundSystem that will display interactible entry representations
-     */
-    function playgroundSystem():Null<PlaygroundSystem<Dynamic>>;
-
-    /**
-     * Prompt the user to enter text
-     */
-    function enterText(prompt:String, resolve:(String) -> Void, maxLength:Float):Void;
-
-    /**
-     * Prompt the user to enter a number
-     */
-    function enterNumber(prompt:String, resolve:(Float) -> Void, min:Float, max:Float, ?inStepsOf:Float, ?allowNaN:Bool):Void;
-
-    /**
-     * Prompt the user to choose a single Entry
-     */
-    function chooseEntry(prompt:String, archive:Archive, resolve:(Entry) -> Void):Void;
-
-    /**
-     * Prompt the user to choose multiple Entries
-     */
-    function chooseEntries(prompt:String, archive:Archive, resolve:(Array<Entry>) -> Void, min:Int, max:Float):Void;
-
-    /**
-     * Update the interface to reflect changes made to Entries through commands
-     */
-    function handleChanges(archive:Archive, changeSet:ChangeSet):Void;
-
-    /**
-     * Tell the user something useful
-     */
-    function displayMessage(message:String):Void;
-
-    /**
-     * Tell the user that something is wrong
-     */
-    function reportError(error:String):Void;
-
-    /**
-     * Update UI to show that the set of selected entries has changed
-     */
-    function onSelectionChanged(selectedEntries:Array<Entry>, lastSelectedEntries:Array<Entry>):Void;
-    
-    /**
-     * Prompt the user to choose a position
-     */
-    function choosePosition(prompt:String, resolve:Position->Void):Void;
-    
-    /**
-     * A way to tell NAT where the cursor is
-     */
-    function cursorPosition():Option<Position>;
-
-    /**
-     * Prompt the user between some string options
-     */
-    function chooseBetweenStrings(prompt:String, choices:Array<String>, resolve:String->Void):Void;
-}
diff --git a/projects/nat-archive-tool/src/nat/BoolExpInterp.hx b/projects/nat-archive-tool/src/nat/BoolExpInterp.hx
deleted file mode 100644
index 10d0a236..00000000
--- a/projects/nat-archive-tool/src/nat/BoolExpInterp.hx
+++ /dev/null
@@ -1,19 +0,0 @@
-package nat;
-
-import kiss.KissInterp;
-import kiss.Prelude;
-
-@:build(kiss.Kiss.build())
-class BoolExpInterp extends KissInterp {
-    public function new() {
-        super();
-    }
-
-    override function resolve(id:String):Dynamic {
-        return try {
-            super.resolve(id);
-        } catch (e:Dynamic) {
-            false;
-        }
-    }
-}
diff --git a/projects/nat-archive-tool/src/nat/BoolExpInterp.kiss b/projects/nat-archive-tool/src/nat/BoolExpInterp.kiss
deleted file mode 100644
index 9abb6a3b..00000000
--- a/projects/nat-archive-tool/src/nat/BoolExpInterp.kiss
+++ /dev/null
@@ -1,5 +0,0 @@
-(function eval [:String expStr :Array<String> activeConditions]
-    (let [interp (new BoolExpInterp)]
-        (doFor condition activeConditions
-            (interp.variables.set condition true))
-        ?(interp.evalKiss expStr)))
diff --git a/projects/nat-archive-tool/src/nat/CLI.hx b/projects/nat-archive-tool/src/nat/CLI.hx
deleted file mode 100644
index 7c5fa30b..00000000
--- a/projects/nat-archive-tool/src/nat/CLI.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package nat;
-
-class CLI {
-    static function main() {
-        CLI_.main();
-    }
-}
diff --git a/projects/nat-archive-tool/src/nat/CLI_.kiss b/projects/nat-archive-tool/src/nat/CLI_.kiss
deleted file mode 100644
index f3331a76..00000000
--- a/projects/nat-archive-tool/src/nat/CLI_.kiss
+++ /dev/null
@@ -1,128 +0,0 @@
-(import sys.FileSystem)
-(import nat.ArchiveController)
-(import nat.systems.PlaygroundSystem)
-(importAll nat.components)
-(import haxe.ds.Option)
-
-(implements nat.ArchiveUI)
-
-// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
-(load "Lib.kiss")
-
-(let [[archiveDir] (Sys.args)]
-    (unless (= "_TEST_" archiveDir)
-        (let [controller
-                    (new ArchiveController
-                        (new Archive archiveDir)
-                        (new CLI_))]
-            (loop
-                (Sys.print ">> ")
-                (let [command
-                            (.trim (.toString (.readLine (Sys.stdin))))]
-                        (controller.tryRunCommand command))))))
-
-(prop &mut :ArchiveController controller)
-(prop :kiss_tools.KeyShortcutHandler<Entry> shortcutHandler null)
-
-(defNew [])
-
-(method :Void enterText [prompt :String->Void resolve maxLength]
-    (Sys.print "$prompt ")
-    (loop
-        (let [entered (.toString (.readLine (Sys.stdin)))]
-            (if !(<= entered.length maxLength)
-                    (Sys.print "Try again? ")
-                {(resolve entered)
-                    (break)}))))
-
-(method :Void enterNumber [prompt :Float->Void resolve :Float min :Float max &opt :Float inStepsOf :Bool allowNaN]
-    (Sys.print "$prompt ")
-    (loop
-        (let [entered (Std.parseFloat (.toString (.readLine (Sys.stdin))))]
-            (if
-                (and (or !allowNaN !(Math.isNaN entered))
-                    (or
-                            !(<= min entered max)
-                            (and inStepsOf !(= 0 (% (- entered min) inStepsOf)))))
-                        (Sys.print "Try again? ")
-                    {(resolve entered)
-                        (break)}))))
-
-    (method :Void chooseEntry [prompt :Archive archive :Entry->Void resolve]
-        (_chooseEntry prompt archive resolve ->(chooseEntry "empty name doesn't match any entries. Try again?" archive resolve)))
-
-    (method :Void _chooseEntry [prompt :Archive archive :Entry->Void resolve :Void->Void onEmptyString]
-        // TODO allow narrowing down with a tag string
-        (enterText "entry name for $prompt"
-            ->:Void name {
-                (if !name
-                        (onEmptyString)
-                    (let [matchingEntries (controller.nameSystem.getEntries name)]
-                        (case (the Array<Entry> matchingEntries)
-                            ([e] (resolve e))
-                            ([] (chooseEntry "name $name doesn't match any entries. Try again?" archive resolve))
-                            // TODO disambiguate entries with the same names by listing stringified versions of them and using enterNumber
-                            (multipleEntries (throw "ambiguous between multiple entries"))
-                            (otherwise))))}
-        Math.POSITIVE_INFINITY))
-
-(method :Void chooseEntries [prompt archive :Array<nat.Entry>->Void resolve min max]
-    (_chooseEntries prompt archive resolve min max []))
-
-(method :Void _chooseEntries [prompt archive :Array<nat.Entry>->Void resolve min max :Array<Entry> collectedEntries]
-    (let [onEmptyString
-                ->:Void (if (<= min collectedEntries.length)
-                        (resolve collectedEntries)
-                    (throw "not enough entries chosen"))
-            &mut :Void->Void chooseNextEntry
-                null
-            _chooseNextEntry
-                ->:Void {(_chooseEntry
-                                prompt
-                                archive
-                                ->:Void e {(collectedEntries.push e)
-                                                // If the maximum is reached, return it
-                                                (if (= max collectedEntries.length)
-                                                        (resolve collectedEntries)
-                                                    // Otherwise, recurse
-                                                    (chooseNextEntry))}
-                                onEmptyString)}]
-        (set chooseNextEntry _chooseNextEntry)
-        (_chooseNextEntry)))
-
-        
-(method handleChanges [:Archive archive :ChangeSet changeSet]
-    (archive.processSystems this)
-    (doFor e changeSet
-        (print (archive.fullString e))))
-
-(method :Void displayMessage [message]
-    (print message))
-
-(method :Void reportError [error] 
-    (print error))
-
-(method :Void onSelectionChanged [:Array<Entry> selectedEntries :Array<Entry> _]
-    (print "Selected:")
-    (controller.PrintSelectedEntries selectedEntries))
-
-(method :Void chooseBetweenStrings [prompt :Array<String> choices :String->Void resolve]
-    (print prompt)
-    (doFor [idx choice] (enumerate choices)
-        (print "$(+ idx 1). $choice"))
-    (enterNumber "Choice" ->num (resolve (nth choices (- (Std.int num) 1))) 1 choices.length 1))
-
-(defAlias &ident neg Math.NEGATIVE_INFINITY)
-(defAlias &ident pos Math.POSITIVE_INFINITY)
-(method :Void choosePosition [prompt :Position->Void resolve]
-    (enterNumber "x" ->x (enterNumber "y" ->y (enterNumber "z" ->z (resolve (objectWith x y z)) neg pos) neg pos) neg pos))
-
-(method :Option<Position> cursorPosition [] None)
-
-(method :Void showPrefixMap [:Map<String,String> map]
-    (doFor =>key thing map
-        (print "$key - $thing")))
-    
-(method :Void hidePrefixMap [])
-
-(method :PlaygroundSystem<String> playgroundSystem [] null)
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/Entry.hx b/projects/nat-archive-tool/src/nat/Entry.hx
deleted file mode 100644
index 920ea58e..00000000
--- a/projects/nat-archive-tool/src/nat/Entry.hx
+++ /dev/null
@@ -1,18 +0,0 @@
-package nat;
-
-import uuid.Uuid;
-
-@:jsonParse(function (json) return new nat.Entry(json.id, json.components, json.files))
-class Entry {
-    public var id:String;
-    public var components:Map<String, String> = [];
-    public var files:Array<FileRef> = [];
-    function toString() {
-        return if (components.exists("Name")) components["Name"] else 'entry $id';
-    }
-    public function new(?id:String, ?components:Map<String,String>, ?files:Array<String>) {
-        this.id = if (id != null) id else Uuid.v4();
-        if (components != null) this.components = components;
-        if (files != null) this.files = files;
-    }
-}
diff --git a/projects/nat-archive-tool/src/nat/EntryRef.hx b/projects/nat-archive-tool/src/nat/EntryRef.hx
deleted file mode 100644
index e5bdde99..00000000
--- a/projects/nat-archive-tool/src/nat/EntryRef.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat;
-
-typedef EntryRef = String;
diff --git a/projects/nat-archive-tool/src/nat/FileRef.hx b/projects/nat-archive-tool/src/nat/FileRef.hx
deleted file mode 100644
index 2cc37203..00000000
--- a/projects/nat-archive-tool/src/nat/FileRef.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat;
-
-typedef FileRef = String;
diff --git a/projects/nat-archive-tool/src/nat/Lib.hx b/projects/nat-archive-tool/src/nat/Lib.hx
deleted file mode 100644
index 0832f1ac..00000000
--- a/projects/nat-archive-tool/src/nat/Lib.hx
+++ /dev/null
@@ -1,11 +0,0 @@
-package nat;
-
-import kiss.Prelude;
-import sys.io.File;
-import tink.Json;
-import uuid.Uuid;
-
-using haxe.io.Path;
-
-@:build(kiss.Kiss.build())
-class Lib {}
diff --git a/projects/nat-archive-tool/src/nat/Lib.kiss b/projects/nat-archive-tool/src/nat/Lib.kiss
deleted file mode 100644
index 01830aef..00000000
--- a/projects/nat-archive-tool/src/nat/Lib.kiss
+++ /dev/null
@@ -1,171 +0,0 @@
-// Lib is its own class because, while it would make sense to group its functions and macros in Archive.kiss,
-// other files would not be able to (load "Archive.kiss") for the macro definitions without taking on Archive's constructor.
-
-// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
-
-(function _log [msg]
-    (#when (or test debug) (print msg)))
-
-(defMacro log [ui msg]
-    (withEvalOnce [ui msg]
-        (when ui
-            (ui.displayMessage msg))
-        (_log msg)))
-
-(defMacro hasComponent [e componentType]
-    `(.exists .components ,e ,(symbolName componentType)))
-
-// Changes to the object returned by (readComponent) will not be saved! Use (withWritableComponents) for making changes
-(defMacro readComponent [e componentType]
-    `(let [componentData (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType))]
-        // (log null (+ "reading " componentData " as " ,(symbolName componentType) " for " .id ,e))
-        (the nat.components ,componentType 
-            // TODO add to the documentation a hint that macros should use fully qualified type paths so macro caller classes don't need to import everything
-            (tink.Json.parse componentData))))
-
-// Return either the desired component, or def if no such component exists
-(defMacro readComponentOr [e componentType def]
-    (withEvalOnce [e]
-        (if (hasComponent e ,componentType)
-                (readComponent e ,componentType)
-            ,def)))
-
-// TODO check not overwriting a component
-(defMacro addComponent [archive e componentType c]
-    (withEvalOnce [archive e c]
-        (withWritableEntry archive e
-            (log null (+ "adding " (the nat.components ,componentType c) " as " ,(symbolName componentType) " for " e.id))
-            (dictSet e.components ,(symbolName componentType) (tink.Json.stringify (the nat.components ,componentType c)))
-            e)))
-
-(defMacro removeComponent [archive e componentType]
-    (withEvalOnce [archive e]
-        (withWritableEntry archive e
-            (log null (+ "removing " ,(symbolName componentType) " component from " e.id))
-            (e.components.remove ,(symbolName componentType))
-            e)))
-
-// Retrieve multiple components from an Entity with mutable access.
-// All components will be serialized after the block is done.
-(defMacro withWritableComponents [archive e bindings &body body]
-    (let [bindingPairs
-                (groups (expList bindings) 2 Throw)
-            bindingList
-                []
-            saveList
-                []
-            retValSymbol
-                (symbol)]
-        (doFor [name type] bindingPairs
-            (bindingList.push `&mut ,name)
-            (bindingList.push `(readComponent ,e ,type))
-            (saveList.push `(dictSet .components ,e ,(symbolName type) (tink.Json.stringify (the nat.components ,type ,name)))))
-        `(let [,@bindingList
-                ,retValSymbol {,@body}]
-            ,@saveList
-            (.refreshEntry ,archive ,e) // Check the entry in and out of systems when its components change
-            ,retValSymbol)))
-
-(defMacro withWritableEntry [archive e &body body]
-    (let [retValSymbol
-                (symbol)]
-        `(let [,retValSymbol {,@body}]
-            (.refreshEntry ,archive ,e)
-            ,retValSymbol)))
-
-// Create a system that selects Entries according to a single string component (i.e. Name or Author) matching the given value
-(defMacro stringComponentSystem [componentType value process]
-    `(new System
-        (lambda [archive :nat.Entry e]
-            ?(and (hasComponent e ,componentType)
-                (= ,value (readComponent e ,componentType))))
-        ,process))
-
-(function :Array<String> tagList [:nat.Entry e]
-    (if (hasComponent e Tags)
-            (let [t (readComponent e Tags)]
-                (collect (t.keys)))
-        []))
-
-(function :Array<String> componentList [:nat.Entry e]
-    (for =>cType cId e.components cType))
-
-(function tagsMatch [e tagsBoolExp]
-    (nat.BoolExpInterp.eval tagsBoolExp (tagList e)))
-
-(function componentsMatch [:nat.Entry e componentsBoolExp]
-    (nat.BoolExpInterp.eval componentsBoolExp (componentList e)))
-
-(function componentsAndTagsMatch [:nat.Entry e componentsAndTagsBoolExp]
-    (nat.BoolExpInterp.eval componentsAndTagsBoolExp (cast (concat (tagList e) (componentList e)))))
-
-(defAlias &call catsMatch componentsAndTagsMatch)
-
-(function addFiles [:nat.Archive archive :nat.Entry e :Array<String> files &opt leaveOriginalCopy]
-    (withWritableEntry archive e
-        (doFor file files
-            (let [pathWithoutDir (haxe.io.Path.withoutDirectory file)]
-                (unless (contains e.files pathWithoutDir)
-                    (let [pathInArchive (joinPath archive.archiveDir "files" pathWithoutDir)]
-                        (unless (sys.FileSystem.exists pathInArchive)
-                            ((if leaveOriginalCopy sys.io.File.copy sys.FileSystem.rename)
-                                file pathInArchive)))
-                    (e.files.push pathWithoutDir))))))
-
-(function removeFiles [:nat.Archive archive :nat.Entry e :Array<String> files]
-    (withWritableEntry archive e
-        (doFor file files
-            (e.files.remove file))))
-
-(function addTags [:nat.Archive archive :nat.Entry e :Array<String> tagsToAdd]
-    (if (hasComponent e Tags)
-            (withWritableComponents archive e [tags Tags]
-                (doFor tag tagsToAdd (dictSet tags tag 1)))
-        (addComponent archive e Tags (for tag tagsToAdd =>tag 1))))
-
-(function removeTags [:nat.Archive archive :nat.Entry e :Array<String> tagsToRemove]
-    (when (hasComponent e Tags)
-        (withWritableComponents archive e [tags Tags]
-            (doFor tag tagsToRemove (tags.remove tag)))))
-
-(function :Float getScale [:nat.Entry e]
-    (if (hasComponent e Images2)
-            (let [i2 (readComponent e Images2)]
-                (nth i2.imageScales i2.pinnedImageIndex))
-        (if (hasComponent e Scale)
-                (readComponent e Scale)
-            1.0)))
-
-(function addConnections [:nat.Archive archive :nat.Entry e :Array<nat.Entry> entriesToConnect]
-    (if (hasComponent e Connections)
-            (withWritableComponents archive e [conn Connections]
-                (doFor e2 entriesToConnect (dictSet conn e2.id 1)))
-        (addComponent archive e Connections (for e2 entriesToConnect =>e2.id 1)))
-    e)
-
-(function removeConnections [:nat.Archive archive :nat.Entry e :Array<nat.Entry> entriesToRemove]
-    (when (hasComponent e Connections)
-        (withWritableComponents archive e [conn Connections]
-            (doFor e2 entriesToRemove (conn.remove e2.id))))
-    e)
-
-(function colorIFromF [:nat.components.ColorF cf]
-    (object r (Std.int (* 255 cf.r)) g (Std.int (* 255 cf.g)) b (Std.int (* 255 cf.b)) a (Std.int (* 255 cf.a))))
-
-(function colorFFromI [:nat.components.ColorI ci]
-    (object r (/ ci.r 255.0) g (/ ci.g 255.0) b (/ ci.b 255.0) a (/ ci.a 255)))
-
-(function addColorFRGBA [:nat.Archive archive :nat.Entry e :Float r :Float g :Float b :Float a]
-    (let [cf (objectWith r g b a)]
-        (addComponent archive e ColorF cf)
-        (addComponent archive e ColorI (colorIFromF cf))))
-
-(function addColorIRGBA [:nat.Archive archive :nat.Entry e :Int r :Int g :Int b :Int a]
-    (let [ci (objectWith r g b a)]
-        (addComponent archive e ColorI ci)
-        (addComponent archive e ColorF (colorFFromI ci))))
-
-(function isEntry [o]
-    (let [fields (Reflect.fields o)]
-        (and (= fields.length 3)
-            (apply and (for f ["id" "components" "files"] (contains fields f))))))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/SelectionCommands.kiss b/projects/nat-archive-tool/src/nat/SelectionCommands.kiss
deleted file mode 100644
index 87645178..00000000
--- a/projects/nat-archive-tool/src/nat/SelectionCommands.kiss
+++ /dev/null
@@ -1,84 +0,0 @@
-// Every command that can select entries has variants that can toggleSelect,
-// addSelect or deSelect instead of setting the selection directly
-
-// TODO The three varations of selection are all O(n) when they would't need to be if _selectedEntries was a Map
-// TODO these commands could avoid calling onSelectionChanged if they don't actually modify the selection
-
-(method selectionCommand [:Array<Entry> entries]
-    (let [lastSelectedEntries _selectedEntries]
-        (set _selectedEntries entries)
-        (ui.onSelectionChanged entries lastSelectedEntries)) [])
-
-(method addSelectionCommand [:Array<Entry> entries]
-    (let [lastSelectedEntries (_selectedEntries.copy)]
-        (doFor e entries
-            (unless (_selectedEntries.contains e)
-                (_selectedEntries.push e)))
-        (ui.onSelectionChanged _selectedEntries lastSelectedEntries)) [])
-
-(method deSelectionCommand [:Array<Entry> entries]
-    (let [lastSelectedEntries (_selectedEntries.copy)]
-        (doFor e entries
-            (_selectedEntries.remove e))
-        (ui.onSelectionChanged _selectedEntries lastSelectedEntries)) [])
-
-(method toggleSelectionCommand [:Array<Entry> entries]
-    (let [lastSelectedEntries (_selectedEntries.copy)]
-        (doFor e entries
-            (unless (_selectedEntries.remove e)
-                (_selectedEntries.push e)))
-        (ui.onSelectionChanged _selectedEntries lastSelectedEntries)) [])
-
-// Define all 4 variants of the command that selects according to the behavior in body
-(defMacro defSelectCommand [name args &body body]
-    (let [nameStr (symbolNameValue name)
-            addName (symbol "Add$nameStr")
-            deSelectName (symbol "De$nameStr")
-            toggleName (symbol "Toggle$nameStr")]
-    `{
-        (defCommand ,name ,args
-            (selectionCommand {,@body}))
-
-        (defCommand ,addName ,args
-            (addSelectionCommand {,@body}))
-
-        (defCommand ,deSelectName ,args
-            (deSelectionCommand {,@body}))
-
-        (defCommand ,toggleName ,args
-            (toggleSelectionCommand {,@body}))
-    }))
-
-(defSelectCommand SelectEntry [e OneEntry]
-    [e])
-
-(defSelectCommand SelectEntries [entries (Entries null null)]
-    entries)
-
-(defSelectCommand SelectAllEntries []
-    (for =>id e archive.entries e))
-
-(defSelectCommand SelectById [id (Text null)]
-    (filter [(dictGet archive.entries id)]))
-
-(defSelectCommand SelectLastChangeSet []
-    lastChangeSet)
-
-(defSelectCommand SelectByTags [tagsBoolExp (Text null)]
-    (filter archive.entries ->e (tagsMatch e tagsBoolExp)))
-
-// variations of SelectByTags that take input from TagsFromAll, not a tagsBoolExp:
-// TODO if we're being really picky these would want a variation of TagsFromAll where DEFINE NEW TAG is not an option :)
-// TODO SelectByTagsAnd
-
-// TODO SelectByTagsOr
-
-(defSelectCommand SelectByComponents [componentsBoolExp (Text null)]
-    (filter archive.entries ->e (componentsMatch e componentsBoolExp)))
-
-// TODO selectByCats
-// there is currently no easy way to defAlias for every variation of a selection command,
-// so Cats may be the canonical name
-
-(defSelectCommand SelectByName [name (Text null)]
-    (nameSystem.getEntries name))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/System.hx b/projects/nat-archive-tool/src/nat/System.hx
deleted file mode 100644
index cf8bf4a9..00000000
--- a/projects/nat-archive-tool/src/nat/System.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package nat;
-
-import kiss.Prelude;
-
-typedef EntryChecker = (Archive, Entry) -> Bool;
-typedef EntryProcessor = (Archive, Entry, ?ArchiveUI) -> Dynamic; // Whatever value is returned will be dropped, but this is easier than requiring ->:Void
-
-@:build(kiss.Kiss.build())
-class System {}
diff --git a/projects/nat-archive-tool/src/nat/System.kiss b/projects/nat-archive-tool/src/nat/System.kiss
deleted file mode 100644
index 2e9b3608..00000000
--- a/projects/nat-archive-tool/src/nat/System.kiss
+++ /dev/null
@@ -1,20 +0,0 @@
-(prop :Map<String,Entry> entries (new Map))
-
-(method :Void process [:Archive archive &opt :ArchiveUI ui]
-    (doFor e (entries.iterator)
-        (print "${name} processing ${e.id}")
-        (processEntry archive e ui)))
-
-(defNew [&prop :String name
-            &prop :EntryChecker canProcessEntry
-            &prop :EntryProcessor processEntry]
-    [])
-
-(prop &mut :Null<EntryProcessor> onRemoveEntry)
-
-(method :Void checkEntryInOrOut [:Archive archive :Entry e]
-    (if (canProcessEntry archive e)
-            (dictSet entries e.id e)
-        (when (entries.exists e.id)
-            (entries.remove e.id)
-            (when onRemoveEntry (onRemoveEntry archive e)))))
diff --git a/projects/nat-archive-tool/src/nat/components/Author.hx b/projects/nat-archive-tool/src/nat/components/Author.hx
deleted file mode 100644
index cbffd0fb..00000000
--- a/projects/nat-archive-tool/src/nat/components/Author.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Author = String;
diff --git a/projects/nat-archive-tool/src/nat/components/CatsMatchExp.hx b/projects/nat-archive-tool/src/nat/components/CatsMatchExp.hx
deleted file mode 100644
index 95783c69..00000000
--- a/projects/nat-archive-tool/src/nat/components/CatsMatchExp.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef CatsMatchExp = String;
diff --git a/projects/nat-archive-tool/src/nat/components/Circle.hx b/projects/nat-archive-tool/src/nat/components/Circle.hx
deleted file mode 100644
index 67a4adfc..00000000
--- a/projects/nat-archive-tool/src/nat/components/Circle.hx
+++ /dev/null
@@ -1,5 +0,0 @@
-package nat.components;
-
-typedef Circle = {
-    radius:Float
-};
diff --git a/projects/nat-archive-tool/src/nat/components/ColorF.hx b/projects/nat-archive-tool/src/nat/components/ColorF.hx
deleted file mode 100644
index b0e37c24..00000000
--- a/projects/nat-archive-tool/src/nat/components/ColorF.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package nat.components;
-
-typedef ColorF = {
-    r:Float,
-    g:Float,
-    b:Float,
-    a:Float
-};
diff --git a/projects/nat-archive-tool/src/nat/components/ColorI.hx b/projects/nat-archive-tool/src/nat/components/ColorI.hx
deleted file mode 100644
index 64a41791..00000000
--- a/projects/nat-archive-tool/src/nat/components/ColorI.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package nat.components;
-
-typedef ColorI = {
-    r:Int,
-    g:Int,
-    b:Int,
-    a:Int
-};
diff --git a/projects/nat-archive-tool/src/nat/components/Connections.hx b/projects/nat-archive-tool/src/nat/components/Connections.hx
deleted file mode 100644
index 7490a8bf..00000000
--- a/projects/nat-archive-tool/src/nat/components/Connections.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Connections = Map<EntryRef,Int>;
diff --git a/projects/nat-archive-tool/src/nat/components/DLURL.hx b/projects/nat-archive-tool/src/nat/components/DLURL.hx
deleted file mode 100644
index a951dbaa..00000000
--- a/projects/nat-archive-tool/src/nat/components/DLURL.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef DLURL = String;
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/components/Dates.hx b/projects/nat-archive-tool/src/nat/components/Dates.hx
deleted file mode 100644
index 730db3a4..00000000
--- a/projects/nat-archive-tool/src/nat/components/Dates.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Dates = Map<String, Date>;
diff --git a/projects/nat-archive-tool/src/nat/components/Images.hx b/projects/nat-archive-tool/src/nat/components/Images.hx
deleted file mode 100644
index 58ee3621..00000000
--- a/projects/nat-archive-tool/src/nat/components/Images.hx
+++ /dev/null
@@ -1,6 +0,0 @@
-package nat.components;
-
-typedef Images = {
-    imageFiles:Array<FileRef>,
-    pinnedImageIndex:Int
-};
diff --git a/projects/nat-archive-tool/src/nat/components/Images2.hx b/projects/nat-archive-tool/src/nat/components/Images2.hx
deleted file mode 100644
index 877ef397..00000000
--- a/projects/nat-archive-tool/src/nat/components/Images2.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package nat.components;
-
-typedef Images2 = {
-    imageFiles:Array<FileRef>,
-    imageScales:Array<Float>,
-    pinnedImageIndex:Int
-};
diff --git a/projects/nat-archive-tool/src/nat/components/KeyShortcut.hx b/projects/nat-archive-tool/src/nat/components/KeyShortcut.hx
deleted file mode 100644
index e7e05b38..00000000
--- a/projects/nat-archive-tool/src/nat/components/KeyShortcut.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef KeyShortcut = String;
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/components/NATCommand.hx b/projects/nat-archive-tool/src/nat/components/NATCommand.hx
deleted file mode 100644
index a88a17fa..00000000
--- a/projects/nat-archive-tool/src/nat/components/NATCommand.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef NATCommand = String;
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/components/NATCommands.hx b/projects/nat-archive-tool/src/nat/components/NATCommands.hx
deleted file mode 100644
index 4af7c98f..00000000
--- a/projects/nat-archive-tool/src/nat/components/NATCommands.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef NATCommands = Array<NATCommand>;
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/components/Name.hx b/projects/nat-archive-tool/src/nat/components/Name.hx
deleted file mode 100644
index 6525d082..00000000
--- a/projects/nat-archive-tool/src/nat/components/Name.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Name = String;
diff --git a/projects/nat-archive-tool/src/nat/components/Position.hx b/projects/nat-archive-tool/src/nat/components/Position.hx
deleted file mode 100644
index 63c85e6e..00000000
--- a/projects/nat-archive-tool/src/nat/components/Position.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Position = {x:Float, y:Float, z:Float};
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/components/Positions.hx b/projects/nat-archive-tool/src/nat/components/Positions.hx
deleted file mode 100644
index 2f6e671c..00000000
--- a/projects/nat-archive-tool/src/nat/components/Positions.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package nat.components;
-
-
-/**
- * Entries can have multiple positions in different UIs/folders/whatever.
- */
-typedef Positions = Map<String, Position>;
diff --git a/projects/nat-archive-tool/src/nat/components/Rectangle.hx b/projects/nat-archive-tool/src/nat/components/Rectangle.hx
deleted file mode 100644
index 66b89e7e..00000000
--- a/projects/nat-archive-tool/src/nat/components/Rectangle.hx
+++ /dev/null
@@ -1,6 +0,0 @@
-package nat.components;
-
-typedef Rectangle = {
-    width:Float,
-    height:Float
-}
diff --git a/projects/nat-archive-tool/src/nat/components/Scale.hx b/projects/nat-archive-tool/src/nat/components/Scale.hx
deleted file mode 100644
index 7c44fc95..00000000
--- a/projects/nat-archive-tool/src/nat/components/Scale.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Scale = Float;
diff --git a/projects/nat-archive-tool/src/nat/components/TagList.hx b/projects/nat-archive-tool/src/nat/components/TagList.hx
deleted file mode 100644
index c3dfe6c9..00000000
--- a/projects/nat-archive-tool/src/nat/components/TagList.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef TagList = Array<String>;
diff --git a/projects/nat-archive-tool/src/nat/components/Tags.hx b/projects/nat-archive-tool/src/nat/components/Tags.hx
deleted file mode 100644
index 8d2d265f..00000000
--- a/projects/nat-archive-tool/src/nat/components/Tags.hx
+++ /dev/null
@@ -1,3 +0,0 @@
-package nat.components;
-
-typedef Tags = Map<String, Int>;
diff --git a/projects/nat-archive-tool/src/nat/components/VibeCheck.hx b/projects/nat-archive-tool/src/nat/components/VibeCheck.hx
deleted file mode 100644
index 48827006..00000000
--- a/projects/nat-archive-tool/src/nat/components/VibeCheck.hx
+++ /dev/null
@@ -1,9 +0,0 @@
-package nat.components;
-
-typedef VibeCheck = {
-    accounts: Array<Float>,
-    monthlyExpenses: Array<Float>,
-    energy: Int,
-    hope: Int,
-    note: String
-};
diff --git a/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.hx b/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.hx
deleted file mode 100644
index 868aec58..00000000
--- a/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.hx
+++ /dev/null
@@ -1,17 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-import haxe.Json;
-
-using haxe.io.Path;
-
-typedef AttachmentProcessor = (Archive, Entry, Array<FileRef>, ?ArchiveUI) -> Dynamic;
-
-/**
- * Base System that processes Entries based on whether they have file attachments
- * which match a given set of extensions
- */
-@:build(kiss.Kiss.build())
-class AttachmentSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.kiss b/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.kiss
deleted file mode 100644
index a8235605..00000000
--- a/projects/nat-archive-tool/src/nat/systems/AttachmentSystem.kiss
+++ /dev/null
@@ -1,18 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew [:String name
-            :Array<String> _extensions
-            :AttachmentProcessor processor]
-    [:Array<String> extensions (for extension _extensions (extension.toLowerCase))]    
-    
-    (super
-        name
-        ->[archive e]
-            {
-                (doFor file e.files
-                    (when !(= -1 (extensions.indexOf (.toLowerCase (file.extension))))
-                        (return true)))
-                false
-            }
-        ->[archive e &opt ui]
-            (processor archive e (filter e.files ->file !(= -1 (extensions.indexOf (file.extension)))) ui)))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.hx b/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.hx
deleted file mode 100644
index 9314f077..00000000
--- a/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.hx
+++ /dev/null
@@ -1,18 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-import haxe.Json;
-#if target.threaded
-import sys.thread.Thread;
-#end
-
-using haxe.io.Path;
-
-/**
- * Base System that processes Entries based on whether they have file attachments
- * which match a given set of extensions
- */
-@:build(kiss.Kiss.build())
-class AutoStepperSystem extends AttachmentSystem {}
diff --git a/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.kiss b/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.kiss
deleted file mode 100644
index aa0a33c1..00000000
--- a/projects/nat-archive-tool/src/nat/systems/AutoStepperSystem.kiss
+++ /dev/null
@@ -1,28 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew []
-    [:String jarPath (joinPath (libPath "nat-archive-tool") "apps/autostepper/AutoStepper.jar")]
-    (super
-        "AutoStepperSystem"
-        ["mp3"]
-        ->[archive e mp3Files &opt ui] 
-            (unless (tagsMatch e "stepperProcessed")
-                (doFor file mp3Files
-                    (localFunction :Void runAutoStepper []
-                        (try
-                            {
-                                (ui.displayMessage "autoStepping $file")
-                                ```
-                                java -jar "${jarPath}" input="$(archive.filePath file)" duration=130 hard=true
-                                ```
-                                (ui.displayMessage "done autostepping $file")
-                                (addTags archive e ["stepperProcessed"])
-                            }
-                            (catch [e] (ui.displayMessage "failed autostepping $file"))))
-                
-                    (#if target.threaded
-                            (Thread.create runAutoStepper)
-                        {
-                            (ui.displayMessage "threading unavailable -- the program will freeze while autostepping")
-                            (runAutoStepper)
-                        })))))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/DLSystem.hx b/projects/nat-archive-tool/src/nat/systems/DLSystem.hx
deleted file mode 100644
index 1c2ea8b9..00000000
--- a/projects/nat-archive-tool/src/nat/systems/DLSystem.hx
+++ /dev/null
@@ -1,12 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-using StringTools;
-#if target.threaded
-import sys.thread.Thread;
-#end
-
-@:build(kiss.Kiss.build())
-class DLSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/DLSystem.kiss b/projects/nat-archive-tool/src/nat/systems/DLSystem.kiss
deleted file mode 100644
index 470cc432..00000000
--- a/projects/nat-archive-tool/src/nat/systems/DLSystem.kiss
+++ /dev/null
@@ -1,48 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew []
-    // Check if youtube-dl is installed before doing anything
-    (let [&mut hasYTDL false]
-        (tryProcess "youtube-dl" [] ->error (when (contains error "You must provide at least one URL") (set hasYTDL true)))
-
-        (super
-            "DLSystem"
-            ->[archive e]
-                (and hasYTDL (catsMatch e "(unless dlProcessed DLURL)"))
-            ->[archive e &opt ui]
-                (let [basename "$(readComponentOr e Name (uuid))-DL"
-                        o "\"${basename}.%(ext)s\""
-                        o (if (= (Sys.systemName) "Windows")
-                                (o.replace "%" "%%")
-                            o)
-                        url (readComponent e DLURL)]
-                    (cond
-                        ((tagsMatch e "music")
-                            // TODO put active dl processes in a map and
-                            // don't start new ones when re-processing
-                            (localFunction :Void downloadMp3 []
-                                (try 
-                                    {
-                                        (ui.displayMessage "downloading $url as $basename")
-                                        ```
-                                        youtube-dl -x --audio-format mp3 -o $o $url
-                                        ```
-                                        (ui.displayMessage "done downloading $basename")
-                                        
-                                        (addFiles archive e ["${basename}.mp3"])
-                                        (addTags archive e ["dlProcessed"]
-                                    }
-                                    (catch [e] (ui.displayMessage "failed downloading $basename"))))
-                            (#if target.threaded
-                                    (Thread.create downloadMp3)
-                                {
-                                    (ui.displayMessage "threading unavailable -- the program will freeze while downloading with youtube-dl")
-                                    (downloadMp3)
-                                    null
-                                }))
-                        (true
-                            (log ui "DLSystem doesn't know what to do with $(readComponent e Tags)")
-                            (return null)))
-
-                    ))))
-
diff --git a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.hx b/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.hx
deleted file mode 100644
index 9bc73fad..00000000
--- a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-using StringTools;
-
-@:build(kiss.Kiss.build())
-class ImageAttachmentSystem extends AttachmentSystem {}
diff --git a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss b/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss
deleted file mode 100644
index 5ca9f07d..00000000
--- a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss
+++ /dev/null
@@ -1,44 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew []
-    (super
-        "ImageAttachmentSystem"
-        ["jpg" "jpeg" "png" "svg"]
-        ->[archive e imageFiles &opt ui]
-            (unless (upgradeToVersion2 archive e)  
-                // TODO an edge case exists when more image files are added to an Entry
-                // after it is assigned an Images component. The new files won't be added
-                (unless (hasComponent e Images2)
-                    (addComponent archive e Images2
-                        (object
-                            imageFiles imageFiles
-                            imageScales (for _ (range imageFiles.length) 1.0)
-                            pinnedImageIndex 0))))))
-
-// Retrofit Images components into Images2 components,
-// which can track a separate scale value for each image.
-// Also, remove text image files -- now that text sprites
-// are generated on the fly.
-(function :Bool upgradeToVersion2 [:nat.Archive archive :nat.Entry e]
-    (if (hasComponent e Images)
-            (let [images1 (readComponent e Images)
-                    scale (readComponentOr e Scale 1.0)
-                    pIdx images1.pinnedImageIndex
-                    textImageFiles (filter images1.imageFiles ->[:String f] (f.startsWith "textImage"))]
-                (removeComponent archive e Images)
-                (removeFiles archive e textImageFiles)
-                (doFor f textImageFiles (images1.imageFiles.remove f))
-                // If all images were removed (the entry only had a text image), don't add Images2
-                (unless images1.imageFiles (return true))
-
-                (addComponent archive e Images2
-                    (object
-                        imageFiles images1.imageFiles
-                        imageScales (cast (concat
-                                        (for _ (range pIdx) 1.0)
-                                        [scale]
-                                        (for _ (range (- images1.imageFiles.length 1 pIdx)) 1.0)))
-                        pinnedImageIndex pIdx))
-                (removeComponent archive e Scale)
-                true)
-        false))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.hx b/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.hx
deleted file mode 100644
index 37cb7778..00000000
--- a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-
-@:build(kiss.Kiss.build())
-class KeyShortcutSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss b/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss
deleted file mode 100644
index 933e8781..00000000
--- a/projects/nat-archive-tool/src/nat/systems/KeyShortcutSystem.kiss
+++ /dev/null
@@ -1,37 +0,0 @@
-(load "../Lib.kiss")
-
-(prop :Map<String,Bool> descriptions (new Map))
-
-(defNew [&prop :ArchiveController controller]
-    [&mut :Bool setup false]
-    (super
-        "KeyShortcutSystem"
-        ->[archive e]
-            (hasComponent e KeyShortcut)
-        ->[archive e &opt ui]
-            {   
-                (when (and ui ui.shortcutHandler)
-                    (unless setup
-                        (set ui.shortcutHandler.onSelectPrefixMap ->:Void [_ map] (ui.showPrefixMap map))
-                        (set ui.shortcutHandler.onSelectItem
-                            ->e {
-                                    (ui.hidePrefixMap)
-                                    (invokeEntry archive ui e)
-                                })
-                        (set ui.shortcutHandler.onBadKey ->[key map] (ui.displayMessage "$key is not mapped to a shortcut in this context: $map"))
-                        (set setup true))
-
-                    (unless (descriptions.exists (readComponent e KeyShortcut))
-                        (ui.shortcutHandler.registerItem (readComponent e KeyShortcut) e)
-                        (dictSet descriptions (readComponent e KeyShortcut) true)))
-                0
-            }))
-
-(method invokeEntry [archive ui :Entry e]
-    // TODO make this doCond
-    (cond
-        ((hasComponent e NATCommand)
-            (controller.tryRunCommand (readComponent e NATCommand)) 0)
-        ((hasComponent e NATCommands)
-            (controller.tryRunCommands (readComponent e NATCommands)) 0)
-        (true (ui.displayMessage "tried to invoke ${e.id} but it has no available actions"))) 0)
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.hx b/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.hx
deleted file mode 100644
index f01d48c8..00000000
--- a/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.hx
+++ /dev/null
@@ -1,13 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-import haxe.Json;
-import haxe.ds.Option;
-
-/**
- * Base System that processes Entries using the HTTP API for any wiki built with MediaWiki
- */
-@:build(kiss.Kiss.build())
-class MediaWikiSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.kiss b/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.kiss
deleted file mode 100644
index 014059f5..00000000
--- a/projects/nat-archive-tool/src/nat/systems/MediaWikiSystem.kiss
+++ /dev/null
@@ -1,67 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew [:String name
-            &prop :String mediaWikiUrl
-            // TODO make a &super annotation that passes an argument to the super constructor
-            :EntryChecker canProcess
-            :EntryProcessor processor
-            &prop :Null<Float> maxLag] 
-    (super
-        name
-        canProcess
-        processor))
-
-// TODO make this an externMethod --
-// but mediaWikiUrl, headers, and maxLag will still have to be specified, not as args
-// unless all vars and props are passed to externmethods by default
-(method :Option<Dynamic> query [:Map<String,Array<String>> params]
-    (let [data
-            (Json.parse
-                (#extern String python
-                    (object
-                        hxmlFile "extern-files/python/args.hxml"
-                        langProjectFile "extern-files/python/requirements.txt")
-                    [:Map<String,Array<String>> params _ :String mediaWikiUrl _ :String maxLag (if maxLag (Std.string maxLag) "1") :Map<String,String> headers _]
-                    
-                    (import requests_externs.Requests)
-                    (print "extern query call $params")
-                    (let [response
-                                (Requests.get mediaWikiUrl 
-                                    (let [innerParams
-                                                [
-                                                    =>"action" "query"
-                                                    =>"maxlag" maxLag
-                                                    =>"format" "json"
-                                                ]]
-                                        (doFor =>param paramValues params (dictSet innerParams param (paramValues.join "|")))
-                                        innerParams)
-                                    (object
-                                        headers headers
-                                        timeout 2))]
-                        (assert response.ok "MediaWiki query failed")
-                        (print "call finished: ${response.text}")
-                        response.text)))]
-        (if data.query
-                (Some data.query)
-            None)))
-
-(method :Array<String> queryImageTitles [:Array<String> pageTitles]
-    (ifLet [(Some queryResult) (query [=>"titles" pageTitles =>"prop" ["images"]])]
-            (flatten
-                (for =>_id page (the haxe.DynamicAccess<Dynamic> queryResult.pages)
-                    (if page.images
-                            (page.images.map ->image image.title)
-                        [])))
-        []))
-
-(method :Array<String> queryImageUrls [:Array<String> imageTitles]
-    (ifLet [(Some queryResult) (query [=>"titles" imageTitles =>"prop" ["imageinfo"] =>"iiprop" ["url"]])]
-            (flatten
-                (for =>_id image
-                        (the haxe.DynamicAccess<Dynamic> queryResult.pages)
-                    (if image.imageinfo
-                            (image.imageinfo.map ->image image.url)
-                        [])))
-        []))
-
-(var headers [=>"User-Agent" "NatArchiveTool/0.0.0 (https://github.com/NQNStudios/kisslang/tree/main/projects/nat-archive-tool; natquaylenelson@gmail.com) Requests/2.26.0"])
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/NameSystem.hx b/projects/nat-archive-tool/src/nat/systems/NameSystem.hx
deleted file mode 100644
index 73694e5b..00000000
--- a/projects/nat-archive-tool/src/nat/systems/NameSystem.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-
-@:build(kiss.Kiss.build())
-class NameSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/NameSystem.kiss b/projects/nat-archive-tool/src/nat/systems/NameSystem.kiss
deleted file mode 100644
index b641f55b..00000000
--- a/projects/nat-archive-tool/src/nat/systems/NameSystem.kiss
+++ /dev/null
@@ -1,21 +0,0 @@
-(load "../Lib.kiss")
-
-(prop :Map<String,Array<Entry>> entriesByName (new Map))
-
-// Stores a case-insensitive map of named entries, for instant lookup by name
-(defNew []
-    (super
-        "NameSystem"
-        ->[archive e] (hasComponent e Name)
-        ->[archive e &opt ui] (let [name (readComponent e Name)]
-                             (if (entriesByName.exists (name.toLowerCase))
-                                    (.push (dictGet entriesByName (name.toLowerCase)) e)
-                                (dictSet entriesByName (name.toLowerCase) [e]))
-                        // Because the if statement doesn't unify by type :(
-                        null)))
-
-(method :Array<Entry> getEntries [name]
-    (let [entries (dictGet entriesByName (name.toLowerCase))]
-        (if entries
-                entries
-            [])))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.hx b/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.hx
deleted file mode 100644
index 98ea9186..00000000
--- a/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.hx
+++ /dev/null
@@ -1,18 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-import nat.components.*;
-import haxe.DynamicAccess;
-import haxe.ds.Option;
-
-typedef PlaygroundEntryProcessor = (Archive, Entry, Position, ?ArchiveUI) -> Dynamic; // Whatever value is returned will be dropped, but this is easier than requiring ->:Void
-typedef PlaygroundConnectionProcessor = (Archive, Entry, Position, Entry, Position, ?ArchiveUI) -> Dynamic; // Whatever value is returned will be dropped, but this is easier than requiring ->:Void
-
-/**
- * Base class for Systems that process Entries in a playground view and displays them in an interactive form
- * (EntrySpriteSystem, for example)
- */
-@:build(kiss.Kiss.build())
-class PlaygroundSystem<EntryRep> extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.kiss b/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.kiss
deleted file mode 100644
index b623036f..00000000
--- a/projects/nat-archive-tool/src/nat/systems/PlaygroundSystem.kiss
+++ /dev/null
@@ -1,106 +0,0 @@
-(load "../Lib.kiss")
-
-(prop &mut :String _playgroundKey "")
-(method :TagList currentDefaultTags []
-    (or
-        (dictGet playgroundDefaultTags _playgroundKey)
-        (new Array<String>)))
-(method :String getPlaygroundKey [] _playgroundKey)
-
-(prop :Map<String,TagList> playgroundDefaultTags (new Map))
-(prop :Map<String,ColorF> playgroundBGColors (new Map))
-(prop :Map<String,EntryRep> entryReps (new Map))
-
-(defNew [:String name
-            &prop :ArchiveUI ui
-            :EntryChecker canProcess
-            &prop :PlaygroundEntryProcessor createEntryRep
-            &prop :PlaygroundConnectionProcessor connectionProcessor
-            :EntryProcessor onRemoveEntry]
-    
-    [:PlaygroundEntryProcessor processor
-        ->[archive e pos &opt ui]
-            (unless (entryReps.exists e.id)
-                (let [eRep (createEntryRep archive e pos ui)]
-                    (dictSet entryReps e.id eRep)))]
-
-    (super
-        name
-        ->[archive e]
-            (or (tagsMatch e "playground")
-                (and (tagsMatch e "!(or done hidden)") (canProcess archive e)))
-        ->[archive e &opt ui]
-            (if setupProcess
-                    // Read playground information from playground Entries
-                    (when (catsMatch e "(and playground Name)")
-                        (let [name (readComponent e Name)]
-                            (if (hasComponent e CatsMatchExp)
-                                    (archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p] (set .catsMatch (dictGet p name) (readComponent e CatsMatchExp)))
-                                (addComponent archive e CatsMatchExp .catsMatch (dictGet archive.playgrounds name)))
-                            (dictSet playgroundBGColors name (readComponentOr e ColorF (object r 0.0 g 0.0 b 0.0 a 1.0)))
-                            (dictSet playgroundDefaultTags name (readComponentOr e TagList []))))
-
-                // Process Entries belonging to the current playground
-                (when (catsMatch e .catsMatch (dictGet archive.playgrounds _playgroundKey))
-                    (when !(hasComponent e Positions)
-                        (addComponent archive e Positions (new Map)))
-                    (let [positions (readComponent e Positions)]
-                        (when !(positions.exists _playgroundKey)
-                            (withWritableComponents archive e [positions Positions]
-                                (dictSet positions _playgroundKey (defaultPosition e)))))
-                    (let [pos (dictGet (readComponent e Positions) _playgroundKey)]
-                        (processor archive e pos ui)))))
-    (set this.onRemoveEntry 
-        ->[archive e &opt ui] {
-            (onRemoveEntry archive e ui)
-            (entryReps.remove e.id)
-        }))
-
-(method switchPlaygroundKey [key]
-    (set _playgroundKey key)
-    (clear (or (dictGet playgroundBGColors _playgroundKey) (object r 0.0 g 0.0 b 0.0 a 1.0)))
-    (set ui.controller.archive.defaultInitializer ->e
-        {
-            (when (currentDefaultTags)
-                (addTags ui.controller.archive e (currentDefaultTags)))
-
-            (whenLet [(Some position) (ui.cursorPosition)]
-                (addComponent ui.controller.archive e Positions [=>_playgroundKey position]))
-        })
-    (process ui.controller.archive ui))
-
-(method :Void clear [:ColorF color]
-    (throw "(PlaygroundSystem.clear <color>) not implemented"))
-
-(prop &mut :Bool setupProcess false)
-
-(method &override :Void process [:Archive archive &opt :ArchiveUI ui]
-    (when setupProcess
-        (super.process archive ui)
-        (set setupProcess false)
-        (return))
-    (when _playgroundKey
-        (super.process archive ui)
-        (doFor e (entries.iterator)
-            (when (hasComponent e Positions)
-                (let [pos (dictGet (readComponent e Positions) _playgroundKey)]
-                    (doFor =>e2id _ (readComponentOr e Connections (new Map<String,Int>))
-                        (whenLet [e2 (dictGet archive.entries e2id)
-                                    pos2 (dictGet (readComponent e2 Positions) _playgroundKey)]
-                            (connectionProcessor archive e pos e2 pos2 ui))))))))
-
-(method savePosition [:Entry e :Float x :Float y &opt :Float z]
-    (withWritableComponents ui.controller.archive e [positions Positions]
-        (let [oldPos (dictGet positions _playgroundKey)]
-            (dictSet positions _playgroundKey
-                (objectWith [z (or z oldPos.z)] x y)))))
-
-(method defaultPosition [:Entry e]
-    (object x 0.0 y 0.0 z 0.0))
-
-(method getSelectedReps []
-    (filter (for e (ui.controller.getSelectedEntries) (dictGet entryReps e.id))))
-
-// TODO overridable circleContainsEntry function (default is to check only the position, Flixel version will use scaled sprite bounding box)
-
-// TODO when a circle contains an entry in the current playground, add it as a child
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.hx b/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.hx
deleted file mode 100644
index a0aba5f0..00000000
--- a/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.hx
+++ /dev/null
@@ -1,8 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import kiss.List;
-import nat.System;
-
-@:build(kiss.Kiss.build())
-class RemarkableAPISystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.kiss b/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.kiss
deleted file mode 100644
index ad895bd8..00000000
--- a/projects/nat-archive-tool/src/nat/systems/RemarkableAPISystem.kiss
+++ /dev/null
@@ -1,16 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew [] 
-    (super
-        "RemarkableAPISystem"
-        ->[archive e] false
-        ->[archive e &opt ui] null)
-        
-    **(#extern String js
-        (object
-            hxmlFile "extern-files/js/args.hxml"
-            skipHaxelibInstall true
-            langProjectFile "extern-files/js/package.json")
-        []
-        (print "extern hello world!")))
-
diff --git a/projects/nat-archive-tool/src/nat/systems/TagSystem.hx b/projects/nat-archive-tool/src/nat/systems/TagSystem.hx
deleted file mode 100644
index 4a899339..00000000
--- a/projects/nat-archive-tool/src/nat/systems/TagSystem.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package nat.systems;
-
-import kiss.Prelude;
-import nat.System;
-
-@:build(kiss.Kiss.build())
-class TagSystem extends System {}
diff --git a/projects/nat-archive-tool/src/nat/systems/TagSystem.kiss b/projects/nat-archive-tool/src/nat/systems/TagSystem.kiss
deleted file mode 100644
index 302f24d3..00000000
--- a/projects/nat-archive-tool/src/nat/systems/TagSystem.kiss
+++ /dev/null
@@ -1,11 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew [:String name
-            &prop :String tagFilterString // This doesn't need to be a &prop because it will be captured by the lambda, but maybe it will be useful to query from the system later
-            // TODO make a &super annotation that passes an argument to the super constructor
-            :EntryProcessor processor] 
-    []
-    (super
-        name
-        (lambda [:Archive archive :Entry e] (tagsMatch e tagFilterString))
-        processor))
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.hx b/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.hx
deleted file mode 100644
index 9789e919..00000000
--- a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.hx
+++ /dev/null
@@ -1,13 +0,0 @@
-package nat.systems;
-
-import nat.systems.MediaWikiSystem;
-import kiss.Prelude;
-
-using haxe.io.Path;
-using StringTools;
-
-/**
- * System which downloads and attaches images from Wikipedia pages that match Entries' names. 
- */
-@:build(kiss.Kiss.build())
-class WikipediaImageSystem extends MediaWikiSystem {}
diff --git a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss b/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss
deleted file mode 100644
index ace8729a..00000000
--- a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss
+++ /dev/null
@@ -1,31 +0,0 @@
-(load "../Lib.kiss")
-
-(defNew []
-    (super
-        "WikipediaImageSystem"
-        "https://en.wikipedia.org/w/api.php"
-        ->[archive e] (tagsMatch e "(and media !wikipediaProcessed)")
-        scrapeForImages
-        1))
-        
-// named method in case a user will want to run it on selectedEntries instead of on media entries
-(method scrapeForImages [archive e &opt ui]
-    (let [:String title
-                (readComponent e Name)
-            :Array<String> wikipediaImageUrls
-                (queryImageUrls (queryImageTitles [title]))]
-        (addFiles archive e
-            (for url wikipediaImageUrls
-                (let [filePath
-                            (joinPath archive.archiveDir
-                                ~(.replace
-                                    (.urlDecode (url.withoutDirectory))
-                                    // Some symbols shouldn't be decoded because they're invalid in file systems!
-                                    "\"" "%22"))]
-                    (log ui "Downloading $title image: $url")
-                    (assertProcess "curl" ["--output" filePath url])
-                    filePath)))
-        // Trigger the creation of a new Images component including the wikipedia images
-        (removeComponent archive e Images)
-        (removeComponent archive e Images2)
-        (addTags archive e ["wikipediaProcessed"])))
diff --git a/projects/nat-archive-tool/src/test/DummyUI.hx b/projects/nat-archive-tool/src/test/DummyUI.hx
deleted file mode 100644
index a2f02f57..00000000
--- a/projects/nat-archive-tool/src/test/DummyUI.hx
+++ /dev/null
@@ -1,59 +0,0 @@
-package test;
-
-import nat.*;
-import nat.systems.PlaygroundSystem;
-import nat.components.Position;
-import nat.ArchiveController.ChangeSet;
-import haxe.ds.Option;
-import kiss_tools.KeyShortcutHandler;
-
-class DummyUI implements ArchiveUI {
-    public var controller:ArchiveController = null;
-
-    public function new() {}
-
-    public function enterText(prompt:String, resolve:(String) -> Void, maxLength:Float) {
-        // TODO for proper testing, this will need to resolve with specific pre-coded strings
-        resolve("");
-    }
-
-    public function enterNumber(prompt:String, resolve:(Float) -> Void, min:Float, max:Float, ?inStepsOf:Float, ?allowNaN:Bool) {
-        // TODO for proper testing, this will need to resolve with specific pre-coded numbers
-        resolve(min);
-    }
-
-    public function chooseEntry(prompt:String, archive:Archive, resolve:(Entry) -> Void) {
-        // TODO for proper testing, this will need to resolve with specific pre-coded entries
-        resolve(null);
-    }
-
-    public function chooseEntries(prompt:String, archive:Archive, resolve:(Array<Entry>) -> Void, min:Int, max:Float) {
-        // TODO for proper testing, this will need to resolve with specific pre-coded entry lists
-        resolve([]);
-    }
-
-    public function chooseBetweenStrings(prompt:String, choices:Array<String>, resolve:String->Void) {
-        resolve(choices[0]);
-    }
-
-    public function handleChanges(archive:Archive, changeSet:ChangeSet) {}
-
-    public function displayMessage(message:String) {}
-
-    public function reportError(error:String) {}
-
-    public function onSelectionChanged(selectedEntries:Array<Entry>, lastSelectedEntries:Array<Entry>) {}
-    
-    public function showPrefixMap(map:Map<String,String>) {}
-    public function hidePrefixMap() {}
-    public function cursorPosition():Option<Position> {
-        return None;
-    };
-    public function choosePosition(prompt:String, resolve:Position->Void) {
-        resolve({x: 0, y: 0, z: 0});
-    }
-    public function playgroundSystem():Null<PlaygroundSystem<Dynamic>> {
-        return null;
-    }
-    public var shortcutHandler:Null<KeyShortcutHandler<Entry>> = null;
-}
diff --git a/projects/nat-archive-tool/src/test/TestMain.hx b/projects/nat-archive-tool/src/test/TestMain.hx
deleted file mode 100644
index ef57c851..00000000
--- a/projects/nat-archive-tool/src/test/TestMain.hx
+++ /dev/null
@@ -1,7 +0,0 @@
-package test;
-
-class TestMain {
-    static function main() {
-        TestMain_.main();
-    }
-}
diff --git a/projects/nat-archive-tool/src/test/TestMain_.kiss b/projects/nat-archive-tool/src/test/TestMain_.kiss
deleted file mode 100644
index bc37d949..00000000
--- a/projects/nat-archive-tool/src/test/TestMain_.kiss
+++ /dev/null
@@ -1,46 +0,0 @@
-(import nat.BoolExpInterp)
-(import nat.Archive)
-(import nat.ArchiveController)
-(import nat.Lib)
-(importAll nat.components)
-(importAll nat.systems)
-(import uuid.Uuid)
-
-// External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
-(load "../nat/Lib.kiss")
-
-(assert (BoolExpInterp.eval "true" []))
-(assert !(BoolExpInterp.eval "false" []))
-(assert !(BoolExpInterp.eval "flag" []))
-(assert (BoolExpInterp.eval "flag" ["flag"]))
-(assert !(BoolExpInterp.eval "(and flag false)" ["flag"]))
-(assert (BoolExpInterp.eval "(or flag otherFlag)" ["otherFlag"]))
-
-(let [archive
-            (new Archive "src/test/example-archive")
-        song1
-            (dictGet archive.entries "song1")
-        song2
-            (dictGet archive.entries "song2")]
-
-    (assert (hasComponent song1 Tags))
-    (assert (hasComponent song2 Tags))
-    (assert (componentsMatch song1 "(and Name Author)"))
-    (assert (componentsMatch song2 "(and Name Author)"))
-    (assert (tagsMatch song1 "(and song western)"))
-    (assert !(tagsMatch song1 "(and song religious)"))
-    (assert (tagsMatch song2 "(and song religious)"))
-    (assert !(tagsMatch song2 "(and song western)"))
-
-    (withWritableComponents archive song1
-        [author Author
-            name Name]
-        (assert (= author "Rafael Krux"))
-        (assert (= name "Adventure")))
-
-    (let [wikipedia (new MediaWikiSystem "Test Wikipedia system" "https://en.wikipedia.org/w/api.php" null null 1)]
-        ~(wikipedia.queryImageUrls (wikipedia.queryImageTitles ["Phoenix Wright"])))
-
-    (let [controller (new ArchiveController archive (new DummyUI))]
-        // TODO test controller
-        0))
diff --git a/projects/nat-archive-tool/src/test/example-archive/entries/song1.json b/projects/nat-archive-tool/src/test/example-archive/entries/song1.json
deleted file mode 100644
index d0474dd8..00000000
--- a/projects/nat-archive-tool/src/test/example-archive/entries/song1.json
+++ /dev/null
@@ -1 +0,0 @@
-{"components":[["Tags","[[\"song\", 1],[\"stepperProcessed\", 1],[\"western\", 1]]"],["Name","\"Adventure\""],["Author","\"Rafael Krux\""]],"files":["Adventure.mp3"],"id":"song1"}
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/test/example-archive/entries/song2.json b/projects/nat-archive-tool/src/test/example-archive/entries/song2.json
deleted file mode 100644
index 50c8de7b..00000000
--- a/projects/nat-archive-tool/src/test/example-archive/entries/song2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"components":[["Tags","[[\"song\", 1],[\"stepperProcessed\", 1],[\"religious\", 1]]"],["Name","\"Ancient Rite\""],["Author","\"Kevin MacLeod\""]],"files":["Ancient Rite.mp3"],"id":"song2"}
\ No newline at end of file
diff --git a/projects/nat-archive-tool/src/test/example-archive/files/Adventure.mp3 b/projects/nat-archive-tool/src/test/example-archive/files/Adventure.mp3
deleted file mode 100644
index e9b3c1b6..00000000
Binary files a/projects/nat-archive-tool/src/test/example-archive/files/Adventure.mp3 and /dev/null differ
diff --git a/projects/nat-archive-tool/src/test/example-archive/files/Ancient Rite.mp3 b/projects/nat-archive-tool/src/test/example-archive/files/Ancient Rite.mp3
deleted file mode 100644
index 63d25e46..00000000
Binary files a/projects/nat-archive-tool/src/test/example-archive/files/Ancient Rite.mp3 and /dev/null differ
diff --git a/projects/nat-archive-tool/src/test/example-archive/playgrounds.json b/projects/nat-archive-tool/src/test/example-archive/playgrounds.json
deleted file mode 100644
index 9e86c1c4..00000000
--- a/projects/nat-archive-tool/src/test/example-archive/playgrounds.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"default": "Playground-MAIN",
-	"Playground-MAIN": {
-		"catsMatch": "true"
-	}
-}
diff --git a/projects/nat-archive-tool/test-cpp.sh b/projects/nat-archive-tool/test-cpp.sh
deleted file mode 100755
index b07205de..00000000
--- a/projects/nat-archive-tool/test-cpp.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#! /bin/bash
-./bin/cpp/TestMain
\ No newline at end of file
diff --git a/projects/nat-archive-tool/test.hxml b/projects/nat-archive-tool/test.hxml
deleted file mode 100644
index 53b5bc47..00000000
--- a/projects/nat-archive-tool/test.hxml
+++ /dev/null
@@ -1,6 +0,0 @@
--D test
--lib kiss
--lib nat-archive-tool
--lib requests-externs
--cp test
---main test.TestMain
\ No newline at end of file
diff --git a/projects/nat-archive-tool/test.sh b/projects/nat-archive-tool/test.sh
deleted file mode 100755
index 0ed00d23..00000000
--- a/projects/nat-archive-tool/test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/bash
-
-# Run these tests on every target that could be used for a NAT front-end
-# (also to test (#extern) on multiple targets)
-haxe test.hxml py.hxml &&
-haxe test.hxml js.hxml &&
-haxe test.hxml cpp.hxml &&
-haxe test.hxml --interp &&
-haxelib run nat-archive-tool _TEST_
\ No newline at end of file