From c5730298b424491a70502fc6d140c59e0630348e Mon Sep 17 00:00:00 2001
From: Dimitris Zervas <dzervas@dzervas.gr>
Date: Sat, 15 Jun 2024 02:55:33 +0300
Subject: [PATCH] Revert "Use the new API in the frontend"

---
 .gitignore                                    |    2 -
 .vscode/launch.json                           |    1 +
 .vscode/settings.json                         |   10 +-
 Cargo.lock                                    |  915 ++------
 Cargo.toml                                    |    5 +-
 README.md                                     |   12 +-
 applications/web/package.json                 |    4 +-
 applications/web/src/App.svelte               |    2 +-
 applications/web/src/components/AppBar.svelte |    2 +-
 applications/web/src/components/Arc.svelte    |   12 +-
 applications/web/src/components/Circle.svelte |    8 +-
 applications/web/src/components/Face.svelte   |   41 +-
 .../web/src/components/FeatureHistory.svelte  |   34 +-
 applications/web/src/components/Line.svelte   |   20 +-
 .../web/src/components/PassiveSketch.svelte   |  219 +-
 applications/web/src/components/Plane.svelte  |    7 +-
 .../web/src/components/Point2D.svelte         |    2 +-
 .../web/src/components/Point3D.svelte         |    1 -
 applications/web/src/components/Scene.svelte  |  122 +-
 .../src/components/SelectableSurface.svelte   |    1 -
 applications/web/src/components/Sketch.svelte |   51 +-
 applications/web/src/components/Solid.svelte  |    1 -
 .../web/src/components/ToolBar.svelte         |    6 +-
 .../controls/CadControls/CadControls.svelte   |    7 +-
 .../src/components/features/Extrusion.svelte  |   16 +-
 .../web/src/components/features/Sketch.svelte |   43 +-
 .../web/src/components/tools/NewCircle.svelte |   86 +-
 .../web/src/components/tools/NewLine.svelte   |   82 +-
 .../src/components/tools/NewRectangle.svelte  |    8 +-
 .../web/src/components/tools/Select.svelte    |    1 -
 applications/web/tests/e2e/test.ts            |    2 +-
 package.json                                  |    3 -
 packages/cadmium-macros/Cargo.toml            |   13 -
 packages/cadmium-macros/src/lib.rs            |  247 --
 packages/cadmium/.cargo/cargo.toml            |    3 -
 packages/cadmium/Cargo.toml                   |   34 +-
 packages/cadmium/README.md                    |   96 +-
 .../benches/faceselector-report/draw.rs       |   66 -
 .../benches/faceselector-report/main.rs       |  130 --
 .../benches/faceselector-report/report.rs     |   63 -
 .../faceselector-report/simple_circles.rs     |   50 -
 .../examples/project_simple_extrusion.rs      |  108 +-
 packages/cadmium/package.json                 |    4 +-
 packages/cadmium/src/archetypes.rs            |  207 +-
 packages/cadmium/src/bin/gen-types.rs         |   53 -
 packages/cadmium/src/error.rs                 |   51 +-
 packages/cadmium/src/extrusion.rs             |  447 ++++
 packages/cadmium/src/feature/extrusion.rs     |  219 --
 packages/cadmium/src/feature/helpers.rs       |  215 --
 packages/cadmium/src/feature/mod.rs           |   45 -
 packages/cadmium/src/feature/point.rs         |  156 --
 packages/cadmium/src/feature/prelude.rs       |   24 -
 packages/cadmium/src/feature/solid.rs         |  151 --
 packages/cadmium/src/isketch/compound.rs      |   36 -
 .../cadmium/src/isketch/compound_rectangle.rs |  109 -
 packages/cadmium/src/isketch/face.rs          |   91 -
 packages/cadmium/src/isketch/mod.rs           |  169 --
 packages/cadmium/src/isketch/primitive.rs     |  212 --
 packages/cadmium/src/lib.rs                   |   88 +-
 packages/cadmium/src/main.rs                  |    4 +-
 packages/cadmium/src/message.rs               |  430 ++++
 packages/cadmium/src/message/idwrap/de.rs     |   83 -
 packages/cadmium/src/message/idwrap/mod.rs    |  105 -
 packages/cadmium/src/message/idwrap/ser.rs    |   37 -
 packages/cadmium/src/message/message.rs       |   60 -
 packages/cadmium/src/message/mod.rs           |   27 -
 packages/cadmium/src/project.rs               |  731 +++---
 packages/cadmium/src/realization.rs           |   52 +
 packages/cadmium/src/sketch/constraints.rs    |  294 +++
 packages/cadmium/src/sketch/intersections.rs  | 1985 +++++++++++++++++
 packages/cadmium/src/sketch/mod.rs            | 1911 ++++++++++++++++
 packages/cadmium/src/sketch/svg.rs            |  640 ++++++
 packages/cadmium/src/solid.rs                 |  326 +++
 packages/cadmium/src/step.rs                  |  111 +
 packages/cadmium/src/step/actions.rs          |   47 -
 packages/cadmium/src/step/hash.rs             |   57 -
 packages/cadmium/src/step/mod.rs              |   66 -
 packages/cadmium/src/step/result.rs           |   45 -
 packages/cadmium/src/step/sketch_action.rs    |   51 -
 packages/cadmium/src/workbench.rs             |  702 ++++--
 packages/shared/cadmium-api.ts                |  100 -
 packages/shared/isotope.d.ts                  |   35 -
 packages/shared/projectUtils.ts               |  487 +++-
 packages/shared/stepTypeGuards.ts             |   63 -
 packages/shared/stores.ts                     |   48 +-
 packages/shared/typeGuards.ts                 |   11 -
 packages/shared/types.d.ts                    |   42 +-
 turbo.json                                    |    2 -
 88 files changed, 8341 insertions(+), 5024 deletions(-)
 delete mode 100644 packages/cadmium-macros/Cargo.toml
 delete mode 100644 packages/cadmium-macros/src/lib.rs
 delete mode 100644 packages/cadmium/.cargo/cargo.toml
 delete mode 100644 packages/cadmium/benches/faceselector-report/draw.rs
 delete mode 100644 packages/cadmium/benches/faceselector-report/main.rs
 delete mode 100644 packages/cadmium/benches/faceselector-report/report.rs
 delete mode 100644 packages/cadmium/benches/faceselector-report/simple_circles.rs
 delete mode 100644 packages/cadmium/src/bin/gen-types.rs
 create mode 100644 packages/cadmium/src/extrusion.rs
 delete mode 100644 packages/cadmium/src/feature/extrusion.rs
 delete mode 100644 packages/cadmium/src/feature/helpers.rs
 delete mode 100644 packages/cadmium/src/feature/mod.rs
 delete mode 100644 packages/cadmium/src/feature/point.rs
 delete mode 100644 packages/cadmium/src/feature/prelude.rs
 delete mode 100644 packages/cadmium/src/feature/solid.rs
 delete mode 100644 packages/cadmium/src/isketch/compound.rs
 delete mode 100644 packages/cadmium/src/isketch/compound_rectangle.rs
 delete mode 100644 packages/cadmium/src/isketch/face.rs
 delete mode 100644 packages/cadmium/src/isketch/mod.rs
 delete mode 100644 packages/cadmium/src/isketch/primitive.rs
 create mode 100644 packages/cadmium/src/message.rs
 delete mode 100644 packages/cadmium/src/message/idwrap/de.rs
 delete mode 100644 packages/cadmium/src/message/idwrap/mod.rs
 delete mode 100644 packages/cadmium/src/message/idwrap/ser.rs
 delete mode 100644 packages/cadmium/src/message/message.rs
 delete mode 100644 packages/cadmium/src/message/mod.rs
 create mode 100644 packages/cadmium/src/realization.rs
 create mode 100644 packages/cadmium/src/sketch/constraints.rs
 create mode 100644 packages/cadmium/src/sketch/intersections.rs
 create mode 100644 packages/cadmium/src/sketch/mod.rs
 create mode 100644 packages/cadmium/src/sketch/svg.rs
 create mode 100644 packages/cadmium/src/solid.rs
 create mode 100644 packages/cadmium/src/step.rs
 delete mode 100644 packages/cadmium/src/step/actions.rs
 delete mode 100644 packages/cadmium/src/step/hash.rs
 delete mode 100644 packages/cadmium/src/step/mod.rs
 delete mode 100644 packages/cadmium/src/step/result.rs
 delete mode 100644 packages/cadmium/src/step/sketch_action.rs
 delete mode 100644 packages/shared/cadmium-api.ts
 delete mode 100644 packages/shared/isotope.d.ts
 delete mode 100644 packages/shared/stepTypeGuards.ts

diff --git a/.gitignore b/.gitignore
index ef7344d3..a70bef23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 /dist
 /target
 /packages/cadmium/target
-/packages/cadmium/bench-*-report
 **/.svelte-kit
 /package
 *.env*
@@ -14,4 +13,3 @@ vite.config.ts.timestamp-*
 /.pnpm-store/
 **/*.obj
 **/*.step
-.vscode
diff --git a/.vscode/launch.json b/.vscode/launch.json
index e633e907..173c5e2a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,6 +13,7 @@
 				"pattern": "Local: +http://127.0.0.1:([0-9]+)/",
 				"uriFormat": "http://127.0.0.1:%s",
 				"webRoot": "${workspaceFolder}/applications/web/src",
+				"killOnServerStop": true
 			}
 		},
 	],
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0c05d521..d6c6b6fe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,13 +3,5 @@
 	"vite.autoStart": false,
 	"vite.buildCommand": "pnpm run build",
 	"vite.devCommand": "pnpm run dev",
-	"vite.showTerminal": true,
-	"cSpell.words": [
-		"bindgen",
-		"isketch",
-		"Threlte",
-		"tsify",
-		"wireframe"
-	],
-	"editor.formatOnSave": true
+	"vite.showTerminal": true
 }
diff --git a/Cargo.lock b/Cargo.lock
index c2969489..a7732f9e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,9 +14,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr 2.7.2",
 ]
@@ -102,15 +102,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "approx"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "array-macro"
 version = "2.1.8"
@@ -140,17 +131,26 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "atomic-polyfill"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
+dependencies = [
+ "critical-section",
+]
+
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -169,9 +169,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.7"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "base64"
@@ -247,9 +247,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "bytemuck"
@@ -262,9 +262,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee891b04274a59bd38b412188e24b849617b2e45a0fd8d057deb63e7403761b"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -273,9 +273,9 @@ dependencies = [
 
 [[package]]
 name = "byteorder"
-version = "1.5.0"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
@@ -291,17 +291,11 @@ name = "cadmium"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "cadmium-macros",
  "console_error_panic_hook",
- "convert_case 0.6.0",
  "crc32fast",
  "geo",
- "indexmap 2.2.6",
- "isotope",
- "itertools 0.13.0",
- "js-sys",
- "log",
- "paste",
+ "indexmap 2.1.0",
+ "itertools 0.12.1",
  "serde",
  "serde_json",
  "serde_with",
@@ -315,20 +309,7 @@ dependencies = [
  "truck-stepio",
  "truck-topology",
  "tsify",
- "tsify-next",
  "wasm-bindgen",
- "wasm-logger",
- "xxhash-rust",
-]
-
-[[package]]
-name = "cadmium-macros"
-version = "0.1.0"
-dependencies = [
- "convert_case 0.6.0",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -410,9 +391,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cesu8"
@@ -459,7 +443,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317"
 dependencies = [
- "approx 0.4.0",
+ "approx",
  "num-traits",
  "serde",
 ]
@@ -535,15 +519,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -595,13 +570,19 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "critical-section"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.13"
@@ -613,21 +594,26 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
 dependencies = [
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
 dependencies = [
+ "autocfg",
+ "cfg-if",
  "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
 ]
 
 [[package]]
@@ -685,9 +671,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -695,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
@@ -709,9 +695,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
@@ -720,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
 dependencies = [
  "powerfmt",
  "serde",
@@ -745,7 +731,7 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case 0.4.0",
+ "convert_case",
  "proc-macro2",
  "quote",
  "rustc_version",
@@ -810,17 +796,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
-[[package]]
-name = "displaydoc"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "dlib"
 version = "0.5.2"
@@ -870,9 +845,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.5"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
+checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
 dependencies = [
  "dtoa",
 ]
@@ -891,19 +866,19 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "earcutr"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01"
+checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d"
 dependencies = [
- "itertools 0.11.0",
+ "itertools 0.10.5",
  "num-traits",
 ]
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "embed-resource"
@@ -1223,9 +1198,9 @@ dependencies = [
 
 [[package]]
 name = "geo"
-version = "0.28.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501"
+checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96"
 dependencies = [
  "earcutr",
  "float_next_after",
@@ -1235,17 +1210,15 @@ dependencies = [
  "num-traits",
  "robust",
  "rstar",
- "serde",
- "spade",
 ]
 
 [[package]]
 name = "geo-types"
-version = "0.7.13"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61"
+checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa"
 dependencies = [
- "approx 0.5.1",
+ "approx",
  "num-traits",
  "rstar",
  "serde",
@@ -1253,11 +1226,11 @@ dependencies = [
 
 [[package]]
 name = "geographiclib-rs"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960"
+checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be"
 dependencies = [
- "libm",
+ "lazy_static",
 ]
 
 [[package]]
@@ -1286,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "gio"
@@ -1388,19 +1361,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "gloo-utils"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
-dependencies = [
- "js-sys",
- "serde",
- "serde_json",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "gobject-sys"
 version = "0.18.0"
@@ -1466,9 +1426,9 @@ dependencies = [
 
 [[package]]
 name = "hash32"
-version = "0.3.1"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
+checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
 dependencies = [
  "byteorder",
 ]
@@ -1481,9 +1441,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1491,11 +1451,14 @@ dependencies = [
 
 [[package]]
 name = "heapless"
-version = "0.8.0"
+version = "0.7.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
+checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
 dependencies = [
+ "atomic-polyfill",
  "hash32",
+ "rustc_version",
+ "spin",
  "stable_deref_trait",
 ]
 
@@ -1545,7 +1508,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.11",
+ "itoa 1.0.9",
 ]
 
 [[package]]
@@ -1560,12 +1523,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1573,9 +1536,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.2"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3935c160d00ac752e09787e6e6bfc26494c2183cc922f1bc678a60d4733bc2"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "hyper"
@@ -1589,7 +1552,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
- "itoa 1.0.11",
+ "itoa 1.0.9",
  "pin-project-lite",
  "smallvec",
  "tokio",
@@ -1618,16 +1581,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core 0.52.0",
+ "windows-core 0.51.1",
 ]
 
 [[package]]
@@ -1649,124 +1612,6 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1775,14 +1620,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "1.0.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -1798,12 +1641,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.14.2",
  "serde",
 ]
 
@@ -1831,19 +1674,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "isotope"
-version = "0.1.0"
-source = "git+https://github.com/CADmium-Co/ISOtope.git#f2f4590e552e3407ae19d811e56cd4c1c83039db"
-dependencies = [
- "geo",
- "nalgebra",
- "serde",
- "thiserror",
- "tsify",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -1853,15 +1683,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1871,15 +1692,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1888,9 +1700,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "javascriptcore-rs"
@@ -1939,9 +1751,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -2050,9 +1862,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
 
 [[package]]
 name = "libredox"
@@ -2070,17 +1882,11 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
 
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -2179,16 +1985,6 @@ dependencies = [
  "num-complex",
 ]
 
-[[package]]
-name = "matrixmultiply"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
-dependencies = [
- "autocfg",
- "rawpointer",
-]
-
 [[package]]
 name = "memchr"
 version = "1.0.2"
@@ -2206,9 +2002,9 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memoffset"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
 dependencies = [
  "autocfg",
 ]
@@ -2227,9 +2023,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -2265,34 +2061,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "nalgebra"
-version = "0.32.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
-dependencies = [
- "approx 0.5.1",
- "matrixmultiply",
- "nalgebra-macros",
- "num-complex",
- "num-rational",
- "num-traits",
- "serde",
- "simba",
- "typenum",
-]
-
-[[package]]
-name = "nalgebra-macros"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ndk"
 version = "0.7.0"
@@ -2365,20 +2133,13 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.6"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
- "serde",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-derive"
 version = "0.3.3"
@@ -2390,30 +2151,11 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
-version = "0.2.19"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
  "libm",
@@ -2579,18 +2321,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr 2.7.2",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "option-ext"
@@ -2652,12 +2394,6 @@ dependencies = [
  "windows-targets 0.52.5",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -2842,8 +2578,8 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
 dependencies = [
- "base64 0.21.7",
- "indexmap 2.2.6",
+ "base64 0.21.5",
+ "indexmap 2.1.0",
  "line-wrap",
  "quick-xml 0.31.0",
  "serde",
@@ -2933,9 +2669,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6"
 dependencies = [
  "unicode-ident",
 ]
@@ -3061,12 +2797,6 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
-[[package]]
-name = "rawpointer"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
-
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -3118,14 +2848,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr 2.7.2",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3139,13 +2869,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr 2.7.2",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.2",
 ]
 
 [[package]]
@@ -3156,9 +2886,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
@@ -3205,9 +2935,9 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
 
 [[package]]
 name = "rstar"
-version = "0.12.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008"
+checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6"
 dependencies = [
  "heapless",
  "num-traits",
@@ -3216,9 +2946,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc-hash"
@@ -3271,18 +3001,9 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "safe_arch"
-version = "0.7.1"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
-dependencies = [
- "bytemuck",
-]
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "same-file"
@@ -3315,7 +3036,7 @@ checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals 0.29.1",
+ "serde_derive_internals",
  "syn 2.0.66",
 ]
 
@@ -3353,9 +3074,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 dependencies = [
  "serde",
 ]
@@ -3369,17 +3090,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.203"
@@ -3393,20 +3103,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive_internals"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.29.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3419,7 +3118,7 @@ version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
- "itoa 1.0.11",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
@@ -3451,24 +3150,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.11",
+ "itoa 1.0.9",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.21.5",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
- "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -3476,9 +3174,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -3538,19 +3236,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "simba"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
-dependencies = [
- "approx 0.5.1",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
-]
-
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -3644,12 +3329,21 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b20a809169ae442497e41a997fc5f14e2eea04e6ac590816a910d5d8068c8c0"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.14.2",
  "num-traits",
  "robust",
  "smallvec",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -3693,9 +3387,9 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.11.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strum"
@@ -3708,11 +3402,11 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.26.4"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -3721,9 +3415,9 @@ dependencies = [
 
 [[package]]
 name = "svg"
-version = "0.17.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "700efb40f3f559c23c18b446e8ed62b08b56b2bb3197b36d57e0470b4102779e"
+checksum = "02d815ad337e8449d2374d4248448645edfe74e699343dd5719139d93fa87112"
 
 [[package]]
 name = "swift-rs"
@@ -3731,7 +3425,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.21.5",
  "serde",
  "serde_json",
 ]
@@ -3764,17 +3458,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "system-deps"
 version = "6.2.2"
@@ -4092,13 +3775,12 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
 dependencies = [
  "deranged",
- "itoa 1.0.11",
- "num-conv",
+ "itoa 1.0.9",
  "powerfmt",
  "serde",
  "time-core",
@@ -4113,24 +3795,28 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
- "num-conv",
  "time-core",
 ]
 
 [[package]]
-name = "tinystr"
-version = "0.7.6"
+name = "tinyvec"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
- "displaydoc",
- "zerovec",
+ "tinyvec_macros",
 ]
 
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
 [[package]]
 name = "tokio"
 version = "1.38.0"
@@ -4199,7 +3885,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4212,7 +3898,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4309,9 +3995,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.14.3"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60"
+checksum = "0b27516dfcfa22a9faaf192283a122bfbede38c1e59ef194e3c4db6549b419c0"
 dependencies = [
  "cocoa",
  "core-graphics",
@@ -4478,12 +4164,10 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "tsify"
 version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0"
+source = "git+https://github.com/siefkenj/tsify#8a5a550d2ab41612cef88a3a3de2a94639b0d3fc"
 dependencies = [
- "gloo-utils 0.1.7",
+ "gloo-utils",
  "serde",
- "serde-wasm-bindgen",
  "serde_json",
  "tsify-macros",
  "wasm-bindgen",
@@ -4492,37 +4176,11 @@ dependencies = [
 [[package]]
 name = "tsify-macros"
 version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals 0.28.0",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "tsify-next"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0407c98efe14c83fd025675246bf855f0ed750b6b57fa6ab839ade598ceb5374"
-dependencies = [
- "gloo-utils 0.2.0",
- "serde",
- "serde_json",
- "tsify-next-macros",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "tsify-next-macros"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "615b1b80acc6720d554777d55ed4ed35a5ceb0e0df7ff7cf9d3946ecbf74953e"
+source = "git+https://github.com/siefkenj/tsify#8a5a550d2ab41612cef88a3a3de2a94639b0d3fc"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals 0.29.1",
+ "serde_derive_internals",
  "syn 2.0.66",
 ]
 
@@ -4573,11 +4231,26 @@ dependencies = [
  "unic-common",
 ]
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
 
 [[package]]
 name = "unicode-segmentation"
@@ -4587,9 +4260,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "url"
-version = "2.5.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -4616,18 +4289,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "uuid"
 version = "1.8.0"
@@ -4727,9 +4388,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -4737,9 +4398,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
@@ -4752,9 +4413,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4764,9 +4425,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4774,9 +4435,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4787,20 +4448,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "wasm-logger"
-version = "0.2.0"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718"
-dependencies = [
- "log",
- "wasm-bindgen",
- "web-sys",
-]
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "wasm-streams"
@@ -4828,9 +4478,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4916,16 +4566,6 @@ dependencies = [
  "windows-core 0.56.0",
 ]
 
-[[package]]
-name = "wide"
-version = "0.7.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8"
-dependencies = [
- "bytemuck",
- "safe_arch",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -4991,11 +4631,11 @@ dependencies = [
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -5034,9 +4674,9 @@ dependencies = [
 
 [[package]]
 name = "windows-result"
-version = "0.1.2"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b"
 dependencies = [
  "windows-targets 0.52.5",
 ]
@@ -5257,9 +4897,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
  "memchr 2.7.2",
 ]
@@ -5274,18 +4914,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "wry"
 version = "0.40.1"
@@ -5349,12 +4977,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "xxhash-rust"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03"
-
 [[package]]
 name = "xz2"
 version = "0.1.7"
@@ -5364,30 +4986,6 @@ dependencies = [
  "lzma-sys",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -5407,46 +5005,3 @@ dependencies = [
  "quote",
  "syn 2.0.66",
 ]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
diff --git a/Cargo.toml b/Cargo.toml
index ee66054c..278b014c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,6 @@
 [workspace]
-members = [ "packages/cadmium", "packages/cadmium-macros", "applications/tauri" ]
+members = ["packages/cadmium", "applications/tauri"]
 resolver = "2"
+
+[patch.crates-io]
+tsify = { git = "https://github.com/siefkenj/tsify" }
diff --git a/README.md b/README.md
index 0e27cdad..d81060c0 100644
--- a/README.md
+++ b/README.md
@@ -108,13 +108,8 @@ yay -S aur/enchant1.6 aur/icu66 aur/libwebp052
 Watch vitest unit tests only:
 
 ```shell
-pnpm test:unit -- -w
-```
-
-Run playwright e2e tests only:
-
-```shell
-pnpm test:unit -- -w
+cd applications/web
+pnpm test:unit -w
 ```
 
 ### rust
@@ -130,8 +125,7 @@ cargo test
 Simple exaples using the rust code can be found in `packages/cadmium/examples`
 
 Run simple rust example with:
-
-```shell
+```
 cargo run --example project_simple_extrusion
 ```
 
diff --git a/applications/web/package.json b/applications/web/package.json
index 43cb0e4a..a31d606e 100644
--- a/applications/web/package.json
+++ b/applications/web/package.json
@@ -6,11 +6,11 @@
     "dev": "vite dev",
     "build": "vite build",
     "preview": "vite preview",
-    "test": "pnpm test:e2e && pnpm test:unit",
+    "test": "pnpm test:integration && pnpm test:unit",
     "lint": "prettier --check . && eslint \"src/**/*.ts\"",
     "format": "prettier . --write .",
     "check": "svelte-check --tsconfig ./tsconfig.json",
-    "test:e2e": "playwright test",
+    "test:integration": "playwright test",
     "test:unit": "vitest",
     "types:guard": "ts-auto-guard --export-all src/types.d.ts"
   },
diff --git a/applications/web/src/App.svelte b/applications/web/src/App.svelte
index aa95dfb0..2f01772c 100644
--- a/applications/web/src/App.svelte
+++ b/applications/web/src/App.svelte
@@ -37,7 +37,7 @@
 
   // log('featureIndex changed to', val)
   // refresh workbench when featureIndex mutates
-  featureIndex.subscribe(_ => $wasmProject["get_workbench"] && workbenchIsStale.set(true))
+  featureIndex.subscribe(val => $wasmProject["get_workbench"] && workbenchIsStale.set(true))
 </script>
 
 <div class="w-[100vw] h-[100vh] block" style="overflow: hidden;">
diff --git a/applications/web/src/components/AppBar.svelte b/applications/web/src/components/AppBar.svelte
index 62231b41..c04fd408 100644
--- a/applications/web/src/components/AppBar.svelte
+++ b/applications/web/src/components/AppBar.svelte
@@ -10,10 +10,10 @@
   import Moon from "phosphor-svelte/lib/Moon"
   import Sun from "phosphor-svelte/lib/Sun"
   import type {WithTarget} from "shared/types"
+  import {isProject} from "shared/typeGuards"
   import {base} from "../base"
   import {renameProject} from "shared/projectUtils"
 
-  // @ts-ignore
   const log = (function () { const context = "[AppBar.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let project: Project
diff --git a/applications/web/src/components/Arc.svelte b/applications/web/src/components/Arc.svelte
index 92caafbd..9f63c020 100644
--- a/applications/web/src/components/Arc.svelte
+++ b/applications/web/src/components/Arc.svelte
@@ -5,16 +5,14 @@
   import {T} from "@threlte/core"
   import {flatten, arcToPoints, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {EntityType} from "shared/types"
+  import type {EntityType, SketchPoint} from "shared/types"
   import {isEntity} from "shared/typeGuards"
-  import type { Point2 } from "cadmium"
 
-  // @ts-ignore
   const log = (function () { const context = "[Arc.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   const type: EntityType = "arc"
 
-  export let id: string, center: Point2, start: Point2, end: Point2
+  export let id: string, center: SketchPoint, start: SketchPoint, end: SketchPoint
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -27,9 +25,9 @@
 
   $: selected = $currentlySelected.some(e => isEntity(e) && e.id === id && e.type === type) ? true : false
 
-  const center2 = new Vector2(center.x, center.y)
-  const start2 = new Vector2(start.x, start.y)
-  const end2 = new Vector2(end.x, end.y)
+  const center2 = new Vector2(center.twoD.x, center.twoD.y)
+  const start2 = new Vector2(start.twoD.x, start.twoD.y)
+  const end2 = new Vector2(end.twoD.x, end.twoD.y)
 
   const points = flatten(promoteTo3(arcToPoints(center2, start2, end2 /** implicit false */))) // defaulted false in function todo ask Matt
 
diff --git a/applications/web/src/components/Circle.svelte b/applications/web/src/components/Circle.svelte
index 00cfcdde..57413622 100644
--- a/applications/web/src/components/Circle.svelte
+++ b/applications/web/src/components/Circle.svelte
@@ -4,15 +4,13 @@
   import {T} from "@threlte/core"
   import {flatten, circleToPoints, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {EntityType} from "shared/types"
-  import type { Point2 } from "cadmium"
+  import type {CircleTuple, EntityType} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[Circle.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   const type: EntityType = "circle"
 
-  export let id: string, center: Point2, radius: number
+  export let id: string, center: CircleTuple["center"], radius: number
 
   // log("[props]", "id:", id, "center:", center, "radius:", radius)
 
@@ -27,7 +25,7 @@
   $: selected = $currentlySelected.some(e => e.id === id && e.type === type) ? true : false
 
   // array of x,y,z points
-  const points = flatten(promoteTo3(circleToPoints(center, radius)))
+  const points = flatten(promoteTo3(circleToPoints(center.twoD, radius)))
 
   const lineGeometry = new LineGeometry()
   lineGeometry.setPositions(points)
diff --git a/applications/web/src/components/Face.svelte b/applications/web/src/components/Face.svelte
index 0d165f30..b23c5368 100644
--- a/applications/web/src/components/Face.svelte
+++ b/applications/web/src/components/Face.svelte
@@ -3,9 +3,9 @@
   import {Path, Vector2, Shape, MeshStandardMaterial, DoubleSide, ShapeGeometry} from "three"
   import {circleToPoints, arcToPoints} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, selectingFor} from "shared/stores"
-  import type {EntityType, IDictionary, Point2WithID} from "shared/types"
+  import type {EntityType, IDictionary, SketchPoint} from "shared/types"
+  // import Sketch from './Sketch.svelte'
 
-  // @ts-ignore
   const log = (function () { const context = "[Face.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   // todo see docs below
@@ -13,7 +13,8 @@
   // 	 exterior: wire
   //   holes: wires[]
   // }
-  export let face: any, id: string, pointsById: IDictionary<Point2WithID>
+  export let face: any, id: string, pointsById: IDictionary<SketchPoint>
+  // log("[props]", "face:", face, "id:", id, "pointsById:", pointsById)
 
   const type: EntityType = "face"
 
@@ -35,33 +36,31 @@
   function writeWireToShape(wire: {Circle: any; Segments: any}, shape: Path) {
     if (wire.Circle) {
       let circle = wire.Circle
-      let center = circle.center.data
-      let radius = circle.data
-      let points = circleToPoints(new Vector2(center[0], center[1]), radius)
+      let center = pointsById[circle.center]
+      let radius = circle.radius
+      let points = circleToPoints(new Vector2(center.twoD.x, center.twoD.y), radius)
       shape.setFromPoints(points)
     } else if (wire.Segments) {
       let points = []
       for (let segment of wire.Segments) {
-        console.log("segment", segment)
-        if ("Line" in segment) {
-          let start = segment.Line.start
-          let end = segment.Line.end
+        if (segment.type === "Line") {
+          let start = pointsById[segment.start]
+          let end = pointsById[segment.end]
 
           if (points.length === 0) {
-            points.push(new Vector2(start.data[0], start.data[1]))
+            points.push(new Vector2(start.twoD.x, start.twoD.y))
           }
-          points.push(new Vector2(end.data[0], end.data[1]))
-        } else if ("Arc" in segment) {
-          // TODO: We use a center + angles, not 3 points
-          let center = segment.Arc.center
-          let start = pointsById[segment.Arc.start]
-          let end = pointsById[segment.Arc.end]
+          points.push(new Vector2(end.twoD.x, end.twoD.y))
+        } else if (segment.type === "Arc") {
+          let center = pointsById[segment.center]
+          let start = pointsById[segment.start]
+          let end = pointsById[segment.end]
 
           let arcPoints = arcToPoints(
-            new Vector2(center.x, center.y),
-            new Vector2(start.x, start.y),
-            new Vector2(end.x, end.y),
-            segment.Arc.clockwise,
+            new Vector2(center.twoD.x, center.twoD.y),
+            new Vector2(start.twoD.x, start.twoD.y),
+            new Vector2(end.twoD.x, end.twoD.y),
+            segment.clockwise,
           )
 
           if (points.length !== 0) {
diff --git a/applications/web/src/components/FeatureHistory.svelte b/applications/web/src/components/FeatureHistory.svelte
index 7ab57b8c..bf608cf1 100644
--- a/applications/web/src/components/FeatureHistory.svelte
+++ b/applications/web/src/components/FeatureHistory.svelte
@@ -1,14 +1,13 @@
 <script lang="ts">
-  import {workbench} from "shared/stores"
+  import {workbench, realization} from "shared/stores"
   import PointFeature from "./features/Point.svelte"
   import PlaneFeature from "./features/Plane.svelte"
   import SketchFeature from "./features/Sketch.svelte"
   import ExtrusionFeature from "./features/Extrusion.svelte"
   import SolidItem from "./SolidItem.svelte"
-  import {isPointStep, isPlaneStep, isSolidStep, isSketchStep, isExtrusionStep} from "shared/stepTypeGuards"
+  import {isPoint, isPlane, isExtrusion, isSketch} from "shared/projectUtils"
   import type {SetCameraFocus} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[FeatureHistory.svelte]"; const color="pink"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   const minHeight = 30
@@ -23,10 +22,11 @@
   $: partsHeight = overallHeight - height - 12
 
   $: history = $workbench.history ?? []
-  $: solids = []
+  $: solids = $realization.solids ?? {}
 
   $: $workbench, log("[$workbench]", $workbench)
   $: $workbench.history, log("[$workbench.history]", $workbench.history)
+  $: $realization, log("[$realization]", $realization)
 
   export let setCameraFocus: SetCameraFocus
 
@@ -56,18 +56,18 @@
 <div class="flex flex-col select-none dark:text-gray-300">
   <div style="height:{Math.min(height, overallHeight - 12)}px" class="overflow-y-auto">
     <div id="history" class="font-bold text-sm px-2 py-2">History ({history.length})</div>
-    {#each history as step, featureIndex}
+    {#each history as feature, featureIdx (feature.data.type + ":" + feature.unique_id)}
       <div>
-        {#if isPointStep(step)}
-          <PointFeature name={step.name} index={featureIndex} />
-        {:else if isPlaneStep(step)}
-          <PlaneFeature name={step.name} index={featureIndex} plane={step.result} {setCameraFocus} />
-        {:else if isSketchStep(step)}
-          <SketchFeature name={step.name} index={featureIndex} hash={step.hash} plane_desc={step.data.plane_description} />
-        {:else if isExtrusionStep(step)}
-          <ExtrusionFeature name={step.name} index={featureIndex} hash={step.hash} data={step.data} />
+        {#if isPoint(feature)}
+          <PointFeature name={feature.name} index={featureIdx} />
+        {:else if isPlane(feature)}
+          <PlaneFeature name={feature.name} index={featureIdx} plane={feature.data.plane} {setCameraFocus} />
+        {:else if isSketch(feature)}
+          <SketchFeature name={feature.name} index={featureIdx} id={feature.unique_id} plane_id={feature.data.plane_description.PlaneId} />
+        {:else if isExtrusion(feature)}
+          <ExtrusionFeature name={feature.name} index={featureIdx} data={feature.data.extrusion} id={feature.unique_id} />
         {:else}
-          <!-- TODO: {step.name} {step.result} -->
+          TODO: {feature.name} {feature.data.type}
         {/if}
       </div>
     {/each}
@@ -78,10 +78,8 @@
     <div class="font-bold text-sm px-2 py-2">
       Solids ({solids ? Object.keys(solids).length : 0})
     </div>
-    {#each history as step}
-      {#if isSolidStep(step)}
-        <SolidItem name={step.name} />
-      {/if}
+    {#each Object.keys(solids) as name (name)}
+      <SolidItem {name} />
     {/each}
   </div>
 </div>
diff --git a/applications/web/src/components/Line.svelte b/applications/web/src/components/Line.svelte
index 8edd368d..152e67fc 100644
--- a/applications/web/src/components/Line.svelte
+++ b/applications/web/src/components/Line.svelte
@@ -5,14 +5,13 @@
   import {T} from "@threlte/core"
   import {flatten, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {EntityType} from "shared/types"
+  import type {EntityType, PointById} from "shared/types"
   import {isEntity} from "shared/typeGuards"
-  import type { Point2 } from "cadmium"
 
-  // @ts-ignore
   const log = (function () { const context = "[Line.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let id: string, start: Point2, end: Point2
+  export let id: string, start: PointById, end: PointById
+  // log("[props]", "id:", id, "start:", start, "end:", end)
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -24,10 +23,19 @@
   const type: EntityType = "line"
 
   let hovered = false
-  $: selected = $currentlySelected.some(e => isEntity(e) && e.id === id && e.type === type) ? true : false
+  $: selected = $currentlySelected.some(e => checkIsEntity(e) && e.id === id && e.type === type) ? true : false
+
+  function checkIsEntity(e: unknown) {
+    // log("[checkIsEntity]", isEntity(e), e)
+    return isEntity(e)
+  }
+
+  // $: selected, log("[selected] an entity has been selected:", selected, "Line.id:", id)
+  // prettier-ignore
+  // $: $currentlySelected, ()=> {if (selected && !$currentlySelected.every((e) => isEntity(e))) log("ERROR [currentlySelected] are not all isEntity", $currentlySelected)}
 
   const points = flatten(
-		promoteTo3([new Vector2(start.x, start.y), new Vector2(end.x, end.y)])
+		promoteTo3([new Vector2(start.twoD.x, start.twoD.y), new Vector2(end.twoD.x, end.twoD.y)])
 	)
 
   const lineGeometry = new LineGeometry()
diff --git a/applications/web/src/components/PassiveSketch.svelte b/applications/web/src/components/PassiveSketch.svelte
index ef4ea44a..1780eb7b 100644
--- a/applications/web/src/components/PassiveSketch.svelte
+++ b/applications/web/src/components/PassiveSketch.svelte
@@ -1,39 +1,33 @@
 <script lang="ts">
+  import {Matrix4, Euler, MeshStandardMaterial, Vector2, Vector3, type Vector3Like} from "three"
+  import {T, useThrelte} from "@threlte/core"
+  import {Text, Suspense} from "@threlte/extras"
+  import {hiddenSketches, previewGeometry, sketchTool} from "shared/stores"
   import Point2D from "./Point2D.svelte"
   import Line from "./Line.svelte"
   import Circle from "./Circle.svelte"
   import Arc from "./Arc.svelte"
   import Face from "./Face.svelte"
-
+  import {LineMaterial} from "three/addons/lines/LineMaterial.js"
+  import {LineGeometry} from "three/addons/lines/LineGeometry.js"
   import NewLineTool from "./tools/NewLine.svelte"
   import NewCircleTool from "./tools/NewCircle.svelte"
   import NewRectangleTool from "./tools/NewRectangle.svelte"
   import SelectTool from "./tools/Select.svelte"
-
-  import {T, useThrelte} from "@threlte/core"
-  import {Text, Suspense} from "@threlte/extras"
-  import {Matrix4, Euler, MeshStandardMaterial, Vector2, Vector3} from "three"
-  import {LineMaterial} from "three/addons/lines/LineMaterial.js"
-  import {LineGeometry} from "three/addons/lines/LineGeometry.js"
-
+  import type {ArcTuple, CircleTuple, FaceTuple, IDictionary, LineTuple, PlaneData, PreviewGeometry, SketchPoint, PointById, SketchRealized} from "shared/types"
   import debounce from "just-debounce-it"
 
-  import {isSketchActionStep, isSketchArcStep, isSketchCircleStep, isSketchLineStep, isSketchPointStep} from "shared/stepTypeGuards"
-  import {hiddenSketches, previewGeometry, sketchTool, workbench} from "shared/stores"
-  import type {IDictionary, PreviewGeometry} from "shared/types"
-  import type {Plane, Point2, StepHash} from "cadmium"
-
-  // @ts-ignore
   const log = (function () { const context = "[PassiveSketch.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let name: string,
-    plane: Plane,
-    hash: StepHash,
-    editing: boolean = false
+    sketch: SketchRealized,
+    plane: PlaneData["data"]["plane"],
+    uniqueId: string,
+    editing = false
 
-  const {size, dpr} = useThrelte()
+  // log("[props]", "name:", name, "sketch:", sketch, "plane:", plane, "uniqueId:", uniqueId, "editing:", editing )
 
-  $: history = $workbench.history ?? []
+  const {size, dpr} = useThrelte()
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -44,6 +38,63 @@
 
   let newLineTool: NewLineTool, newCircleTool: NewCircleTool, newRectangleTool: NewRectangleTool, selectTool: SelectTool
 
+  let pointTuples: PointById[] = []
+  let lineTuples: LineTuple[] = []
+  let circleTuples: CircleTuple[] = []
+  let arcTuples: ArcTuple[] = []
+  let faceTuples: FaceTuple[] = []
+  let pointsById: IDictionary<SketchPoint> = {}
+
+  // $: pointTuples, log("[pointTuples]", pointTuples)
+  // $: lineTuples, log("[lineTuples]", lineTuples)
+  // $: circleTuples, log("[circleTuples]", circleTuples)
+  // $: arcTuples, log("[arcTuples]", arcTuples)
+  // $: faceTuples, log("[faceTuples]", faceTuples)
+  // $: pointsById, log("[pointsById]", pointsById)
+
+  $: {
+    const pointIds = Object.keys(sketch.points)
+    pointTuples = []
+    pointsById = {}
+    for (const id of pointIds) {
+      const point3D = sketch.points[id]
+      const point2D = sketch.points_2d[id]
+      pointTuples.push({id, twoD: point2D, threeD: point3D})
+      pointsById[id] = {twoD: point2D, threeD: point3D}
+    }
+
+    lineTuples = []
+    for (const id of Object.keys(sketch.line_segments)) {
+      const line = sketch.line_segments[id]
+      const start = pointsById[line.start]
+      const end = pointsById[line.end]
+      lineTuples.push({id, start, end})
+    }
+
+    circleTuples = []
+    for (const id of Object.keys(sketch.circles)) {
+      const circle = sketch.circles[id]
+      const center = pointsById[circle.center]
+      const radius = circle.radius
+      circleTuples.push({id, center, radius})
+    }
+
+    arcTuples = []
+    for (const id of Object.keys(sketch.arcs)) {
+      const arc = sketch.arcs[id]
+      const center = pointsById[arc.center]
+      const start = pointsById[arc.start]
+      const end = pointsById[arc.end]
+      arcTuples.push({id, center, start, end})
+    }
+
+    faceTuples = []
+    for (const id of Object.keys(sketch.faces)) {
+      const face = sketch.faces[id]
+      faceTuples.push({id, face})
+    }
+  }
+
   // Build some Three.js vectors from the props
   const origin_point = new Vector3(plane.origin.x, plane.origin.y, plane.origin.z)
   const primary = new Vector3(plane.primary.x, plane.primary.y, plane.primary.z)
@@ -87,12 +138,8 @@
   const lineGeometry = new LineGeometry()
   lineGeometry.setPositions(points)
 
-  $: hidden = $hiddenSketches.includes(hash) && !editing
-  $: $hiddenSketches, log("[$hiddenSketches]", hidden)
-  $: pointsById = history.reduce((acc, step) => {
-    if (isSketchPointStep(step)) acc[step.hash] = step.result.action
-    return acc
-  }, {} as IDictionary<Point2>)
+  $: hidden = $hiddenSketches.includes(uniqueId) && !editing
+  // $: $hiddenSketches, log("[$hiddenSketches]", $hiddenSketches)
 
   $: if (editing) $sketchTool = "select"
 
@@ -103,6 +150,7 @@
   }
 
   function isGeomType(geom: PreviewGeometry, type: string) {
+    // log("[isGeomType]", type, geom)
     return geom.type === type
   }
 </script>
@@ -121,17 +169,17 @@
       on:click={e => {
         if (editing) {
           if ($sketchTool === "line") {
-            newLineTool.click(e, projectToPlane(e.point))
+            newLineTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
           } else if ($sketchTool === "circle") {
-            newCircleTool.click(e, projectToPlane(e.point))
+            newCircleTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
           } else if ($sketchTool === "rectangle") {
-            newRectangleTool.click(e, projectToPlane(e.point))
+            newRectangleTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
           } else if ($sketchTool === "select") {
             selectTool.click(e, projectToPlane(e.point))
           }
         }
       }}
-      on:pointermove={debounce((e: any) => {
+      on:pointermove={debounce(e => {
         if (editing) {
           if ($sketchTool === "line") {
             newLineTool.mouseMove(e, projectToPlane(e.point))
@@ -146,10 +194,10 @@
       <T.PlaneGeometry args={[width * 100, height * 100]} />
     </T.Mesh>
 
-    <SelectTool bind:this={selectTool} sketchIndex={hash} active={$sketchTool === "select"} />
-    <NewLineTool bind:this={newLineTool} {pointsById} sketchIndex={hash} active={$sketchTool === "line"} {projectToPlane} />
-    <NewCircleTool bind:this={newCircleTool} {pointsById} sketchId={hash} active={$sketchTool === "circle"} {projectToPlane} />
-    <NewRectangleTool bind:this={newRectangleTool} {pointsById} sketchIndex={hash} active={$sketchTool === "rectangle"} {projectToPlane} />
+    <SelectTool bind:this={selectTool} sketchIndex={uniqueId} active={$sketchTool === "select"} />
+    <NewLineTool bind:this={newLineTool} {pointsById} sketchIndex={uniqueId} active={$sketchTool === "line"} {projectToPlane} />
+    <NewCircleTool bind:this={newCircleTool} {pointsById} sketchIndex={uniqueId} active={$sketchTool === "circle"} {projectToPlane} />
+    <NewRectangleTool bind:this={newRectangleTool} {pointsById} sketchIndex={uniqueId} active={$sketchTool === "rectangle"} {projectToPlane} />
 
     <T.Line2
       geometry={lineGeometry}
@@ -165,61 +213,54 @@
       </Suspense>
     </T.Group>
 
-    {#each history as step}
-      {#if isSketchPointStep(step)}
-        <Point2D x={step.result.action.x} y={step.result.action.y} hidden={step.result.action.hidden} id={step.hash} {collisionLineMaterial} />
-      {:else if isSketchCircleStep(step)}
-        <Circle
-          center={pointsById[step.result.action.center]}
-          radius={step.result.action.radius}
-          id={step.hash}
-          {solidLineMaterial}
-          {solidHoveredMaterial}
-          {solidSelectedMaterial}
-          {dashedHoveredMaterial}
-          {dashedLineMaterial}
-          {collisionLineMaterial}
-        />
-      {:else if isSketchArcStep(step)}
-        <!-- TODO: Use start & end angle instead of points -->
-        <Arc
-          center={pointsById[step.result.action.center]}
-          start={pointsById[0]}
-          end={pointsById[1]}
-          id={step.hash}
-          {solidLineMaterial}
-          {solidHoveredMaterial}
-          {solidSelectedMaterial}
-          {dashedHoveredMaterial}
-          {dashedLineMaterial}
-          {collisionLineMaterial}
-        />
-      {:else if isSketchLineStep(step)}
-        <Line
-          start={pointsById[step.result.action.start]}
-          end={pointsById[step.result.action.end]}
-          id={step.hash}
-          {solidLineMaterial}
-          {solidHoveredMaterial}
-          {solidSelectedMaterial}
-          {dashedHoveredMaterial}
-          {dashedLineMaterial}
-          {collisionLineMaterial}
-        />
-      {/if}
+    {#each circleTuples as circle (circle.id)}
+      <Circle
+        center={circle.center}
+        radius={circle.radius}
+        id={circle.id}
+        {solidLineMaterial}
+        {solidHoveredMaterial}
+        {solidSelectedMaterial}
+        {dashedHoveredMaterial}
+        {dashedLineMaterial}
+        {collisionLineMaterial}
+      />
+    {/each}
 
-      {#if isSketchActionStep(step)}
-        {#each step.result.faces as face, faceId}
-          <Face face={face} id={`${hash}-${faceId}`} {pointsById} />
-        {/each}
-      {/if}
+    {#each arcTuples as arc (arc.id)}
+      <Arc
+        center={arc.center}
+        start={arc.start}
+        end={arc.end}
+        id={arc.id}
+        {solidLineMaterial}
+        {solidHoveredMaterial}
+        {solidSelectedMaterial}
+        {dashedHoveredMaterial}
+        {dashedLineMaterial}
+        {collisionLineMaterial}
+      />
+    {/each}
+
+    {#each lineTuples as line (line.id)}
+      <Line
+        start={line.start}
+        end={line.end}
+        id={line.id}
+        {solidLineMaterial}
+        {solidHoveredMaterial}
+        {solidSelectedMaterial}
+        {dashedHoveredMaterial}
+        {dashedLineMaterial}
+        {collisionLineMaterial}
+      />
     {/each}
 
     {#each $previewGeometry as geom (geom.uuid)}
       {#if isGeomType(geom, "line")}
         <Line
-          start={geom.start!}
-          end={geom.end!}
+          start={geom.start}
+          end={geom.end}
           id={geom.uuid}
           {solidLineMaterial}
           {solidHoveredMaterial}
@@ -230,8 +271,8 @@
         />
       {:else if isGeomType(geom, "circle")}
         <Circle
-          center={geom.center!}
-          radius={geom.radius!}
+          center={geom.center}
+          radius={geom.radius}
           id={geom.uuid}
           {solidLineMaterial}
           {solidHoveredMaterial}
@@ -241,8 +282,16 @@
           {collisionLineMaterial}
         />
       {:else if isGeomType(geom, "point")}
-        <Point2D x={geom.x!} y={geom.y!} hidden={false} id={geom.uuid} isPreview {collisionLineMaterial} />
+        <Point2D x={geom.x} y={geom.y} hidden={false} id={geom.uuid} isPreview {collisionLineMaterial} />
       {/if}
     {/each}
+
+    {#each pointTuples as { id, twoD, threeD } (id)}
+      <Point2D x={twoD.x} y={twoD.y} hidden={threeD.hidden} {id} {collisionLineMaterial} />
+    {/each}
+
+    {#each faceTuples as face (`${faceTuples.length}-${face.id}`)}
+      <Face face={face.face} id={face.id} {pointsById} />
+    {/each}
   </T.Group>
 {/if}
diff --git a/applications/web/src/components/Plane.svelte b/applications/web/src/components/Plane.svelte
index bcc1ee92..c31f8ad5 100644
--- a/applications/web/src/components/Plane.svelte
+++ b/applications/web/src/components/Plane.svelte
@@ -10,11 +10,12 @@
   import {currentlySelected, currentlyMousedOver, selectingFor, selectionMin, selectionMax} from "shared/stores"
   import type {EntityType} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[Plane.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let name: string, id: string, width: number, height: number, origin: Vector3Like, primary: Vector3Like, secondary: Vector3Like, tertiary: Vector3Like
 
+  // log("[props]","name:",name,"id:",id,"width:",width,"height:",height,"origin:",origin,"primary:",primary,"secondary:",secondary,"tertiary:",tertiary)
+
   extend({Line2})
 
   const {size, dpr} = useThrelte()
@@ -139,9 +140,9 @@
           // number of selected entities, boot the oldest one
           if ($currentlySelected.length + 1 > $selectionMax) $currentlySelected.shift()
 
-          /**   cadmium wants a string for id whereas for most ids it wants number, u64 iirc
+          /**   cadmium wants a string for id whereas for most ids it wants number, u64 iirc 
 								we should use number for all entity ids? seems cleaner to use one type. otherwise we could do:
-
+					
 					  		interface Entity {
 									id: number | string
 									type: EntityType
diff --git a/applications/web/src/components/Point2D.svelte b/applications/web/src/components/Point2D.svelte
index 9542d470..d2b43da5 100644
--- a/applications/web/src/components/Point2D.svelte
+++ b/applications/web/src/components/Point2D.svelte
@@ -9,7 +9,7 @@
   import type {EntityType} from "shared/types"
   import {base} from "../base"
 
-  export let x: number, y: number, hidden: boolean, id: string
+  export let x, y, hidden: boolean, id: string
   export let isPreview = false
 
   export let collisionLineMaterial: LineMaterial
diff --git a/applications/web/src/components/Point3D.svelte b/applications/web/src/components/Point3D.svelte
index 15560e1b..81552a5f 100644
--- a/applications/web/src/components/Point3D.svelte
+++ b/applications/web/src/components/Point3D.svelte
@@ -11,7 +11,6 @@
 
   export let x: number, y: number, z: number, hidden: boolean, id: string
   export let isPreview = false
-  console.log("Point3D.svelte", {x, y, z, hidden, id})
 
   export let collisionLineMaterial: LineMaterial
 
diff --git a/applications/web/src/components/Scene.svelte b/applications/web/src/components/Scene.svelte
index f6df0db9..a713ebbc 100644
--- a/applications/web/src/components/Scene.svelte
+++ b/applications/web/src/components/Scene.svelte
@@ -4,7 +4,7 @@
   import {Vector2, Vector3, type Vector3Like} from "three"
   import {interactivity} from "@threlte/extras"
   import {LineMaterial} from "three/addons/lines/LineMaterial.js"
-  import {workbench, sketchBeingEdited} from "shared/stores"
+  import {realization, workbench, sketchBeingEdited} from "shared/stores"
   import Point3D from "./Point3D.svelte"
   import Plane from "./Plane.svelte"
   import Solid from "./Solid.svelte"
@@ -12,16 +12,29 @@
   import CubeGizmo from "./controls/CubeGizmo/CubeGizmo.svelte"
   import {base} from "../base"
   import CadControls from "./controls/CadControls/CadControls.svelte"
-  import {isPlaneStep, isPointStep, isSketchStep, isSolidStep} from "shared/stepTypeGuards"
 
-  // @ts-ignore
   const log = (function () { const context = "[Scene.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   interactivity()
 
   const {size, dpr, camera} = useThrelte()
 
-  $: history = $workbench.history ?? []
+  $: points = $realization.points ? Object.entries($realization.points) : []
+  $: planes = $realization.planes ? Object.entries($realization.planes) : []
+  $: planesById = planes ? Object.fromEntries(planes) : {}
+  $: solids = $realization.solids ? Object.entries($realization.solids) : []
+  $: sketches = $realization.sketches ? Object.entries($realization.sketches) : []
+
+  // $: $workbench, log("[$workbench]", $workbench)
+  // $: points, log("[realization.points]", points)
+  // $: planes, log("[realization.planes]", planes)
+  // $: planesById, log("[planesById]", planesById)
+  // $: solids, log("[realization.solids]", solids)
+  // $: sketches, log("[realization.sketches]", sketches)
+
+  // put it on window for debugging. todo remove
+  if (!(globalThis as any).realization) (globalThis as any).realization = []
+  $: $realization, (() => ((globalThis as any).realization = [...(globalThis as any).realization, $realization]))()
 
   export function setCameraFocus(goTo: Vector3Like, lookAt: Vector3Like, up: Vector3Like): void {
     // TODO: make this tween nicely
@@ -109,7 +122,7 @@
 </script>
 
 <T.OrthographicCamera makeDefault position={[160.8, -250.8, 200.55]} zoom={5} up={[0, 0, 1]}>
-  <CadControls rotateSpeed={1.8} panSpeed={0.5} mouseButtons={{LEFT: 2, MIDDLE: 50, RIGHT: 1}} />
+  <CadControls rotateSpeed={1.8} panSpeed={0.5} on:create={({ref}) => {}} mouseButtons={{LEFT: 2, MIDDLE: 50, RIGHT: 1}} />
 </T.OrthographicCamera>
 
 <!-- <T.DirectionalLight args={['#ff8888', 50.0]} position.x={-10} position.y={0} position.z={0} />
@@ -125,57 +138,54 @@
 <!-- <T.AmbientLight intensity={0.6} /> -->
 
 <Environment path="{base}/envmap/hdr/" files="kloofendal_28d_misty_puresky_1k.hdr" isBackground={false} format="hdr" />
-{#each history as step}
-  {#if isPointStep(step)}
-    <Point3D
-      id={step.hash}
-      x={step.result.x}
-      y={step.result.y}
-      z={step.result.z}
-      hidden={step.result.hidden}
-      {collisionLineMaterial}
-    />
-  {:else if isPlaneStep(step)}
-    <Plane
-      name={step.name}
-      id={step.hash}
-      height={100}
-      width={100}
-      origin={step.result.origin}
-      primary={step.result.primary}
-      secondary={step.result.secondary}
-      tertiary={step.result.tertiary}
-    />
-  {:else if isSketchStep(step)}
-    <Sketch
-      hash={step.hash}
-      name={step.name}
-      sketch={step.result}
-      editing={$sketchBeingEdited === step.hash}
-      {solidLineMaterial}
-      {solidHoveredMaterial}
-      {solidSelectedMaterial}
-      {dashedHoveredMaterial}
-      {dashedLineMaterial}
-      {collisionLineMaterial}
-    />
-  {:else if isSolidStep(step)}
-    {#each step.result.solids as solid}
-      <Solid
-        name={step.name}
-        indices={solid.indices}
-        vertices={solid.vertices}
-        normals={solid.normals}
-        truckSolid={solid.truck_solid}
-        {solidLineMaterial}
-        {solidHoveredMaterial}
-        {solidSelectedMaterial}
-        {dashedHoveredMaterial}
-        {dashedLineMaterial}
-        {collisionLineMaterial}
-      />
-    {/each}
-  {/if}
+
+{#each points as [pointName, point] (`${$workbench.name}-${pointName}`)}
+  <Point3D id={pointName} x={point.x} y={point.y} z={point.z} hidden={point.hidden} {collisionLineMaterial} />
+{/each}
+
+{#each planes as [planeName, plane] (`${$workbench.name}-${planeName}`)}
+  <Plane
+    name={plane.name}
+    id={planeName}
+    height={plane.height}
+    width={plane.width}
+    origin={plane.plane.origin}
+    primary={plane.plane.primary}
+    secondary={plane.plane.secondary}
+    tertiary={plane.plane.tertiary}
+  />
+{/each}
+
+{#each sketches as [sketchId, sketchTuple] (`${$workbench.name}-${sketchId}`)}
+  <Sketch
+    uniqueId={sketchId}
+    name={sketchTuple[2]}
+    {sketchTuple}
+    editing={$sketchBeingEdited === sketchId}
+    plane={planesById[sketchTuple[0].plane_id]}
+    {solidLineMaterial}
+    {solidHoveredMaterial}
+    {solidSelectedMaterial}
+    {dashedHoveredMaterial}
+    {dashedLineMaterial}
+    {collisionLineMaterial}
+  />
+{/each}
+
+{#each solids as [solidName, solid] (`${$workbench.name}-${solidName}-${solid.crc32}`)}
+  <Solid
+    name={solidName}
+    indices={solid.indices}
+    vertices={solid.vertices}
+    normals={solid.normals}
+    truckSolid={solid.truck_solid}
+    {solidLineMaterial}
+    {solidHoveredMaterial}
+    {solidSelectedMaterial}
+    {dashedHoveredMaterial}
+    {dashedLineMaterial}
+    {collisionLineMaterial}
+  />
 {/each}
 
 <CubeGizmo verticalPlacement={"top"} size={140} paddingX={20} paddingY={20} {setCameraFocus} />
diff --git a/applications/web/src/components/SelectableSurface.svelte b/applications/web/src/components/SelectableSurface.svelte
index bf5c50d6..dddca715 100644
--- a/applications/web/src/components/SelectableSurface.svelte
+++ b/applications/web/src/components/SelectableSurface.svelte
@@ -8,7 +8,6 @@
   import type {EntityType, TruckEdge, TruckFace, TruckFaceBoundary} from "shared/types"
   import nurbs from "nurbs"
 
-  // @ts-ignore
   const log = (function () { const context = "[SelectableSurface.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let truck_face: TruckFace, truck_edges: TruckEdge[], id: string
diff --git a/applications/web/src/components/Sketch.svelte b/applications/web/src/components/Sketch.svelte
index 54027f5f..3ddc86f0 100644
--- a/applications/web/src/components/Sketch.svelte
+++ b/applications/web/src/components/Sketch.svelte
@@ -1,15 +1,14 @@
 <script lang="ts">
-  import PassiveSketch from "./PassiveSketch.svelte"
-
   import type {LineMaterial} from "three/examples/jsm/lines/LineMaterial.js"
-
+  import PassiveSketch from "./PassiveSketch.svelte"
   import {currentlySelected, previewGeometry, sketchTool} from "shared/stores"
-  import type {ISketch} from "cadmium"
+  import type {PlaneRealized, SketchTuple} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[Sketch.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let hash: string, name: string, sketch: ISketch, editing: boolean = false
+  export let uniqueId: string, name: string, sketchTuple: SketchTuple, editing: boolean, plane: PlaneRealized
+
+  // log("[props]", "uniqueId:", uniqueId, "name:", name, "sketchTuple", sketchTuple, "editing", editing, "plane", plane)
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -45,17 +44,33 @@
   }
 </script>
 
-<PassiveSketch
-  {name}
-  {hash}
-  plane={sketch.plane}
-  editing
-  {solidLineMaterial}
-  {solidHoveredMaterial}
-  {solidSelectedMaterial}
-  {dashedHoveredMaterial}
-  {dashedLineMaterial}
-  {collisionLineMaterial}
-/>
+{#if editing}
+  <PassiveSketch
+    {name}
+    {uniqueId}
+    sketch={sketchTuple[0]}
+    plane={plane.plane}
+    editing
+    {solidLineMaterial}
+    {solidHoveredMaterial}
+    {solidSelectedMaterial}
+    {dashedHoveredMaterial}
+    {dashedLineMaterial}
+    {collisionLineMaterial}
+  />
+{:else}
+  <PassiveSketch
+    {name}
+    {uniqueId}
+    sketch={sketchTuple[1]}
+    plane={plane.plane}
+    {solidLineMaterial}
+    {solidHoveredMaterial}
+    {solidSelectedMaterial}
+    {dashedHoveredMaterial}
+    {dashedLineMaterial}
+    {collisionLineMaterial}
+  />
+{/if}
 
 <svelte:window on:keydown={onKeyDown} />
diff --git a/applications/web/src/components/Solid.svelte b/applications/web/src/components/Solid.svelte
index 0b5904c5..f68c7c03 100644
--- a/applications/web/src/components/Solid.svelte
+++ b/applications/web/src/components/Solid.svelte
@@ -6,7 +6,6 @@
   import type {TruckBoundary, TruckEdge, TruckFace, TruckSolid} from "shared/types"
   import type {Vector3Like} from "three"
 
-  // @ts-ignore
   const log = (function () { const context = "[Solid.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let name: string, indices, vertices, normals, truckSolid: TruckSolid
diff --git a/applications/web/src/components/ToolBar.svelte b/applications/web/src/components/ToolBar.svelte
index 993a8213..0d195ff3 100644
--- a/applications/web/src/components/ToolBar.svelte
+++ b/applications/web/src/components/ToolBar.svelte
@@ -7,6 +7,7 @@
 
   let solving = false
   // todo ask Matt why is this a no-op?
+  const solveSketch = () => {}
   const createNewExtrusion = () => {
     newExtrusion()
     // set that as the current feature being edited
@@ -17,6 +18,7 @@
     newSketchOnPlane()
     $featureIndex = $workbench.history.length - 1
   }
+  const stepSketch = () => {}
   const debugging = false
 
   const actions = [
@@ -31,6 +33,8 @@
   ]
 
   const sketchActions = [
+    {alt: "solve", src: `${base}/actions/solve_min.svg`, text: "Solve", handler: solveSketch},
+    {alt: "step", src: `${base}/actions/step_min.svg`, text: "Step", handler: stepSketch},
     {alt: "line", src: `${base}/actions/line.svg`, handler: () => ($sketchTool = "line")},
     {alt: "circle", src: `${base}/actions/circle.svg`, handler: () => ($sketchTool = "circle")},
     {alt: "rectangle", src: `${base}/actions/rectangle.svg`, handler: () => ($sketchTool = "rectangle")},
@@ -38,7 +42,7 @@
 </script>
 
 <div class="col-span-2 flex flex-none items-center gap-1 bg-gray-100 dark:bg-gray-800 dark:text-gray-300 h-[45px] select-none">
-  {#if $sketchBeingEdited !== null}
+  {#if $sketchBeingEdited !== ""}
     {#each sketchActions as action}
       <button class="inline-flex items-center p-1 {$sketchTool === action.alt ? 'bg-gray-400' : 'hover:bg-gray-200'} p-1" on:click={action.handler}>
         <img class="h-8 w-8" src={action.src} alt={action.alt} />{action.text ? action.text : ""}
diff --git a/applications/web/src/components/controls/CadControls/CadControls.svelte b/applications/web/src/components/controls/CadControls/CadControls.svelte
index ac7c646b..ee0c40dc 100644
--- a/applications/web/src/components/controls/CadControls/CadControls.svelte
+++ b/applications/web/src/components/controls/CadControls/CadControls.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {T, useTask, useParent, useThrelte} from "@threlte/core"
+  import {forwardEventHandlers, T, useTask, useParent, useThrelte} from "@threlte/core"
 
   import type {Camera} from "three"
   import {TrackballControls as ThreeTrackballControls} from "./CadControls.js"
@@ -31,14 +31,13 @@
     autoInvalidate: false,
   })
 
-  // const component = forwardEventHandlers()
+  const component = forwardEventHandlers()
 
   const {trackballControls} = useControlsContext()
   trackballControls.set(ref)
   onDestroy(() => trackballControls.set(undefined))
 </script>
 
-<!-- <T is={ref} let:ref {...$$restProps} bind:this={$component} on:change={invalidate}> -->
-<T is={ref} let:ref {...$$restProps} on:change={invalidate}>
+<T is={ref} let:ref {...$$restProps} bind:this={$component} on:change={invalidate}>
   <slot {ref} />
 </T>
diff --git a/applications/web/src/components/features/Extrusion.svelte b/applications/web/src/components/features/Extrusion.svelte
index 90c308d0..59036d75 100644
--- a/applications/web/src/components/features/Extrusion.svelte
+++ b/applications/web/src/components/features/Extrusion.svelte
@@ -4,24 +4,22 @@
   import {arraysEqual, renameStep, updateExtrusion} from "shared/projectUtils"
   import {selectingFor, workbenchIsStale, featureIndex, currentlySelected, hiddenSketches} from "shared/stores"
   import X from "phosphor-svelte/lib/X"
+  import type {ExtrusionData} from "shared/types"
   import {base} from "../../base"
-  import type {FeatureExtrusionAdd} from "shared/cadmium-api"
-  import type { StepHash } from "cadmium"
 
-  // @ts-ignore
   const log = (function () { const context = "[ExtrusionFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let name: string, index: number, hash: StepHash, data: FeatureExtrusionAdd
+  export let name: string, index: number, id: string, data: ExtrusionData["data"]["extrusion"]
 
   // $: data, log("[props]", "name:", name, "index:", index, "id:", id, "data:", data)
   // $: data, log("[props]", "typeof id:", typeof id, "id:", id)
   // $: data, log("[props]", "typeof data.face_ids[0]:", typeof data.face_ids[0], "data.face_ids:", data.face_ids)
 
   // coerce from number[] to string[] for frontend as we use strings for ids here
-  let faceIdsFromInputs = data.faces.sort().map(e => e + "")
+  let faceIdsFromInputs = data.face_ids.sort().map(e => e + "")
 
   // reactive update of selected faces
-  $: if (data && data.faces) faceIdsFromInputs = data.faces.map(e => e + "").sort()
+  $: if (data && data.face_ids) faceIdsFromInputs = data.face_ids.map(e => e + "").sort()
 
   let length = data.length
 
@@ -41,13 +39,13 @@
 
   function sendUpdate(specificFaceIds?: string[]) {
     if (specificFaceIds) {
-      updateExtrusion(hash, data.sketch_id, length, specificFaceIds)
+      updateExtrusion(id, data.sketch_id, length, specificFaceIds)
     } else {
       const faceIdsFromSelection = $currentlySelected
         .filter(e => e.type === "face")
         .map(e => e.id)
         .sort()
-      updateExtrusion(hash, data.sketch_id, length, faceIdsFromSelection)
+      updateExtrusion(id, data.sketch_id, length, faceIdsFromSelection)
     }
   }
 
@@ -153,7 +151,7 @@
         <button
           class="flex-grow bg-sky-500 hover:bg-sky-700 text-white font-bold py-1.5 px-1 shadow"
           on:click={() => {
-            renameStep(hash, name)
+            renameStep(index, name)
           }}>Done</button
         >
 
diff --git a/applications/web/src/components/features/Sketch.svelte b/applications/web/src/components/features/Sketch.svelte
index 0f62ad83..c4ec9132 100644
--- a/applications/web/src/components/features/Sketch.svelte
+++ b/applications/web/src/components/features/Sketch.svelte
@@ -18,14 +18,12 @@
   import X from "phosphor-svelte/lib/X"
   import type {Entity} from "shared/types"
   import {base} from "../../base"
-  import type {PlaneDescription, StepHash} from "cadmium"
-  import {isPlaneDescriptionPlane, isPlaneDescriptionSolid} from "shared/typeGuards"
 
-  // @ts-ignore
   const log = (function () { const context = "[SketchFeature.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let name: string, index: number, hash: StepHash, plane_desc: PlaneDescription | undefined
-  log("[props]", "name:", name, "index:", index, "hash:", hash, "plane_desc:", plane_desc)
+  export let name: string, index: number, id: string, plane_id: string
+
+  // $: name, log("[props] name:", name, "index:", index, "id:", id, "plane_id:", plane_id)
 
   const source = `${base}/actions/sketch_min.svg`
 
@@ -33,18 +31,10 @@
   let selectingForSketchPlane = false
 
   $: {
-    if (plane_desc === undefined) {
-      surface = null
-    } else if (isPlaneDescriptionPlane(plane_desc!)) {
-      surface = {type: "plane", id: `${plane_desc!.PlaneId}`}
-    } else if (isPlaneDescriptionSolid(plane_desc!)) {
-      // surface = {type: "meshFace", id: plane_desc!.solid_id}
-      log("Surface is a meshFace", surface)
+    if (plane_id !== "") {
+      surface = {type: "plane", id: plane_id}
     } else {
       surface = null
-    }
-
-    if (surface === null) {
       engageSearchForPlane()
     }
   }
@@ -54,7 +44,7 @@
   const closeAndRefresh = () => {
     log("closing, refreshing")
     $featureIndex = 1000
-    $sketchBeingEdited = null
+    $sketchBeingEdited = ""
     $sketchTool = ""
     $selectingFor = []
     $selectionMax = 1000
@@ -62,7 +52,10 @@
     $currentlySelected = []
   }
 
-  $: if ($featureIndex === index) $sketchBeingEdited = hash
+  $: if ($featureIndex === index) $sketchBeingEdited = id
+
+  // $: $sketchBeingEdited,
+  // 	log("[$sketchBeingEdited]", `${$sketchBeingEdited === "" ? "empty" : ""}`, $sketchBeingEdited)
 
   const engageSearchForPlane = () => {
     // log("engage search!")
@@ -92,13 +85,13 @@
 
   currentlySelected.subscribe(() => {
     if (!selectingForSketchPlane) return
-    if (!hash) return
+    if (!id) return
     if (!$currentlySelected.length) return
     // log("CS changed when selecting for Sketch Plane:", $currentlySelected)
 
     let thingSelected = $currentlySelected[0]
     if (thingSelected.type === "plane") {
-      setSketchPlane(hash, parseInt(thingSelected.id))
+      setSketchPlane(id, thingSelected.id)
     } else if (thingSelected.type === "meshFace") {
       log("HOW DO I HANDLE THIS?")
       log(thingSelected)
@@ -135,20 +128,20 @@
   <div
     class="ml-auto mr-2 bg-gray-100 hover:bg-gray-200 dark:bg-gray-800 dark:hover:bg-gray-500 px-1 py-1 rounded"
     on:click={() => {
-      if ($hiddenSketches.includes(hash)) {
+      if ($hiddenSketches.includes(id)) {
         // cool, unhide
         hiddenSketches.update(sketches => {
-          return sketches.filter(sketch => sketch !== hash)
+          return sketches.filter(sketch => sketch !== id)
         })
       } else {
         // cool, hide
         hiddenSketches.update(sketches => {
-          return [...sketches, hash]
+          return [...sketches, id]
         })
       }
     }}
   >
-    {#if $hiddenSketches.includes(hash)}
+    {#if $hiddenSketches.includes(id)}
       <EyeSlash weight="light" size="18px" />
     {:else}
       <Eye weight="light" size="18px" />
@@ -184,7 +177,7 @@
         on:focusin={engageSearchForPlane}
         on:focusout={disengageSearchForPlane}
       >
-        <div class="h-8"></div>
+        <div class="h-8" />
         {#if surface !== null}
           <div class="bg-sky-200 pl-2 py-0.5 m-1 rounded text-sm">
             {surface.type}:{surface.id}<button
@@ -201,7 +194,7 @@
           class="flex-grow bg-sky-500 hover:bg-sky-700 text-white font-bold py-1.5 px-1 shadow"
           on:click={() => {
             // This is a form button so remember that it triggers the form's on:submit
-            renameStep(hash, name)
+            renameStep(index, name)
           }}>Done</button
         >
 
diff --git a/applications/web/src/components/tools/NewCircle.svelte b/applications/web/src/components/tools/NewCircle.svelte
index 3643c812..b372a755 100644
--- a/applications/web/src/components/tools/NewCircle.svelte
+++ b/applications/web/src/components/tools/NewCircle.svelte
@@ -1,45 +1,50 @@
 <script lang="ts">
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
-  import {bench} from "shared/projectUtils"
-  import {Vector2, Vector3, type Vector2Like} from "three"
-  import type {Point2D, ProjectToPlane, IDictionary, Point2WithID} from "shared/types"
-  import type { Point2 } from "cadmium"
+  import {addCircleBetweenPoints, addPointToSketch} from "shared/projectUtils"
+  import {Vector3, type Vector2Like, type Vector3Like} from "three"
+  import type {PointLikeById, Point2D, PointsLikeById, ProjectToPlane} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[NewCircleTool.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let pointsById: IDictionary<Point2>
-  export let sketchId: string
+  export let pointsById: PointsLikeById
+  export let sketchIndex: string
   export let active: boolean
   export let projectToPlane: ProjectToPlane
 
-  let centerPoint: Point2WithID | undefined = undefined
-  let stack: Point2WithID[] = []
+  let centerPoint: PointLikeById | null = null
+  let stack: PointLikeById[] = []
 
   $: if ($sketchTool !== "circle") clearStack()
 
-  function pushToStack(point: Point2WithID) {
+  function pushToStack(point: PointLikeById) {
     if (!point) return
-    point.id = point.id ?? bench.sketchAddPoint(sketchId, point.x, point.y).data
+    point.id = point.id ?? addPointToSketch(sketchIndex, point.twoD, false)
     stack.push(point)
   }
 
-  function processPoint(point: Point2WithID) {
-    if (stack.length === 0) {
-      centerPoint = point
-      pushToStack(point)
-      return
+  function processPoint(point: PointLikeById) {
+    pushToStack(point)
+    centerPoint = point
+
+    switch (stack.length) {
+      case 0: // nothing to do, the stack is empty
+        break
+      case 1: // can't create a circle with only one point!
+        break
+      default:
+        const circumference = popFromStack()
+        const center = popFromStack()
+        addCircleBetweenPoints(sketchIndex, center.id, circumference.id)
+        clearStack()
+        break
     }
-
-    const radius = calcDeltas(centerPoint!, point)
-    bench.sketchAddCircle(sketchId, centerPoint!.id!, radius)
-    clearStack()
   }
 
-  export function click(_event: Event, projected: Vector2) {
+  export function click(_event: Event, projected: {twoD: Vector2Like; threeD: Vector3Like}) {
     if ($snapPoints.length > 0) processPoint($snapPoints[0])
     else {
-      processPoint({x: projected.x, y: projected.y, hidden: false} as Point2WithID)
+      let pt: PointLikeById = {twoD: projected.twoD, threeD: projected.threeD, id: null}
+      processPoint(pt)
     }
   }
 
@@ -50,15 +55,19 @@
     // TODO: in the future, we should also snap to the midpoints of lines
     // and to the perimeters of circles and so on
     // so these snap points do not necessarily correspond to actual points in the sketch
-    let snappedTo: Point2WithID | null = null
+    let snappedTo = null
     for (const geom of $currentlyMousedOver) {
       if (geom.type === "point3D") {
-        const point = projectToPlane(new Vector3(geom.x, geom.y, geom.z))
-        snappedTo = {x: point.x, y: point.y, hidden: false} as Point2WithID
+        const twoD = projectToPlane(new Vector3(geom.x, geom.y, geom.z))
+        snappedTo = {
+          twoD: {x: twoD.x, y: twoD.y},
+          threeD: {x: geom.x, y: geom.y, z: geom.z},
+          id: null,
+        }
       }
       if (geom.type === "point") {
         const point = pointsById[geom.id]
-        if (point && geom.id) snappedTo = {x: point.x, y: point.y, hidden: false, id: geom.id} as Point2WithID
+        if (point.twoD && point.threeD && geom.id) snappedTo = {twoD: point.twoD, threeD: point.threeD, id: geom.id}
         break // If there is a 2D point, prefer to use it rather than the 3D point
       }
     }
@@ -68,20 +77,25 @@
     else if ($snapPoints.length > 0) $snapPoints = []
 
     if (centerPoint) {
-      const radius = snappedTo ? calcDeltas(snappedTo!, centerPoint) : calcDeltas(projected, centerPoint)
+      function calcDeltas(a: Vector2Like | Point2D | {x: number; y: number}, b: Vector2Like | undefined) {
+        const dx = a.x - b?.x!
+        const dy = a.y - b?.y!
+        return Math.hypot(dx, dy)
+      }
+      const radius = snappedTo ? calcDeltas(snappedTo.twoD, centerPoint.twoD) : calcDeltas(projected, centerPoint.twoD)
 
       previewGeometry.set([
         {
           type: "circle",
           center: centerPoint,
           radius,
-          uuid: `circle-${centerPoint.x}-${centerPoint.y}-${radius}`,
+          uuid: `circle-${centerPoint.twoD?.x}-${centerPoint.twoD?.y}-${radius}`,
         },
         {
           type: "point",
-          x: centerPoint.x,
-          y: centerPoint.y,
-          uuid: `point-${centerPoint.x}-${centerPoint.y}`,
+          x: centerPoint.twoD?.x,
+          y: centerPoint.twoD?.y,
+          uuid: `point-${centerPoint.twoD?.x}-${centerPoint.twoD?.y}`,
         },
       ])
     } else {
@@ -97,20 +111,14 @@
     }
   }
 
-  function calcDeltas(a: Vector2Like | Point2D | {x: number; y: number}, b: Vector2Like | undefined) {
-    const dx = a.x - b?.x!
-    const dy = a.y - b?.y!
-    return Math.hypot(dx, dy)
-  }
-
   function clearStack() {
-    centerPoint = undefined
+    centerPoint = null
     previewGeometry.set([])
     snapPoints.set([])
     stack = []
   }
 
-  function popFromStack(): Point2WithID | undefined {
+  function popFromStack(): PointLikeById | undefined {
     return stack.pop()
   }
 </script>
diff --git a/applications/web/src/components/tools/NewLine.svelte b/applications/web/src/components/tools/NewLine.svelte
index a7cc0b6f..fd809ed2 100644
--- a/applications/web/src/components/tools/NewLine.svelte
+++ b/applications/web/src/components/tools/NewLine.svelte
@@ -1,93 +1,107 @@
 <script lang="ts">
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
-  import {bench} from "shared/projectUtils"
-  import {Vector2, Vector3} from "three"
-  import type {IDictionary, Point2WithID, PreviewGeometry, ProjectToPlane} from "shared/types"
-  import type {Point2} from "cadmium"
+  import {addLineToSketch, addPointToSketch} from "shared/projectUtils"
+  import {Vector3} from "three"
+  import type {IDictionary, Point, PointLikeById, PreviewGeometry, ProjectToPlane, SketchPoint} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[NewLineTool.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let pointsById: IDictionary<Point2>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
+  export let pointsById: IDictionary<SketchPoint>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
 
-  let previousPoint: Point2WithID | null = null
+  let previousPoint: PointLikeById | null = null
 
-  let stack: Point2WithID[] = []
+  let stack: PointLikeById[] = []
 
   $: if ($sketchTool !== "line") clearStack()
 
-  function pushToStack(point: Point2WithID) {
+  function pushToStack(point: PointLikeById) {
     // point should have the following properties:
     // - twoD: an object with x and y properties representing the point in 2D space
     // - threeD: an object with x, y, and z properties representing the point in 3D space
     // - id: a string representing the id of the point in the sketch
     // If the id is nullish we call addPointToSketch to create a new point in the sketch.
     if (!point) return
-    point.id = point.id ?? bench.sketchAddPoint(sketchIndex, point.x, point.y).data
+    point.id = point.id ?? addPointToSketch(sketchIndex, point.twoD, false)
     stack.push(point)
   }
 
-  function processPoint(point: Point2WithID) {
+  function processPoint(point: PointLikeById) {
     pushToStack(point)
     previousPoint = point
 
-    if (stack.length > 1) {
-      const endPoint = popFromStack()
-      const startPoint = popFromStack()
-      bench.sketchAddLine(sketchIndex, startPoint!.id!, endPoint!.id!)
-
-      // leave the current point on the stack in case we want to create another line from here
-      pushToStack(point)
-      // unless it's an earlier point, which means we're finished making lines, so we clear the stack
-      const isEarlierPoint = pointsById[point.id!]
-      if (isEarlierPoint) clearStack()
+    switch (stack.length) {
+      case 0: // nothing to do, the stack is empty
+        break
+      case 1: // can't create a line with only one point!
+        break
+      default:
+        const endPoint = popFromStack()
+        const startPoint = popFromStack()
+        addLineToSketch(sketchIndex, +startPoint.id, +endPoint.id)
+
+        // leave the current point on the stack in case we want to create another line from here
+        pushToStack(point)
+        // unless it's an earlier point, which means we're finished making lines, so we clear the stack
+        const isEarlierPoint = !!pointsById[point.id!]
+        if (isEarlierPoint) clearStack()
+        break
     }
   }
 
-  export function click(_event: Event, projected: Vector2) {
+  export function click(_event: Event, projected: Point) {
     if ($snapPoints.length > 0) processPoint($snapPoints[0])
-    else processPoint({x: projected.x, y: projected.y, hidden: false} as Point2WithID)
+    else processPoint({twoD: projected.twoD, threeD: projected.threeD, id: null})
   }
 
   export function mouseMove(_event: Event, projected: {x: number; y: number}) {
     // TODO: in the future, we should also snap to the midpoints of lines
     // and to the perimeters of circles and so on
     // so these snap points do not necessarily correspond to actual points in the sketch
-    let snappedTo: Point2WithID | null = null
+    let snappedTo: PointLikeById | null = null
 
     for (const geom of $currentlyMousedOver) {
       if (geom.type === "point3D") {
         if (geom.x && geom.y && geom.z) {
           const twoD = projectToPlane(new Vector3(geom.x, geom.y, geom.z))
-          snappedTo = { x: twoD.x, y: twoD.y, hidden: false } as Point2WithID
+          const point: PointLikeById = {
+            twoD: {x: twoD.x, y: twoD.y},
+            threeD: {x: geom.x, y: geom.y, z: geom.z},
+            id: null,
+          } satisfies PointLikeById
+          snappedTo = point
         }
       }
       if (geom.type === "point") {
-        snappedTo = pointsById[geom.id]
+        const point = pointsById[geom.id]
+        snappedTo = {
+          twoD: point.twoD,
+          threeD: point.threeD,
+          id: geom.id,
+        } satisfies PointLikeById
         break // If there is a 2D point, prefer to use it rather than the 3D point
       }
     }
 
     // only reset $snapPoints if something has changed
-    if (snappedTo) $snapPoints = [snappedTo] satisfies Point2WithID[]
+    if (snappedTo) $snapPoints = [snappedTo] satisfies PointLikeById[]
     else if ($snapPoints.length > 0) $snapPoints = []
 
     if (previousPoint) {
-      let end: Point2WithID = {x: projected.x, y: projected.y, hidden: false} as Point2WithID
+      let end: PointLikeById = {twoD: {x: projected.x, y: projected.y}} satisfies PointLikeById
 
       if (snappedTo) end = snappedTo
 
       const previewGeoms = [
-        {type: "line", start: previousPoint, end: end, uuid: `line-${end.x}-${end.y}`},
-        {type: "point", x: end.x, y: end.y, uuid: `point-${end.x}-${end.y}`},
+        {type: "line", start: previousPoint, end: end, uuid: `line-${end.twoD!.x}-${end.twoD!.y}`},
+        {type: "point", x: end.twoD!.x, y: end.twoD!.y, uuid: `point-${end.twoD!.x}-${end.twoD!.y}`},
       ] satisfies PreviewGeometry[]
 
       if (previousPoint.id === null) {
         const p = {
           type: "point",
-          x: previousPoint.x,
-          y: previousPoint.y,
-          uuid: `point-null-${previousPoint.x}-${previousPoint.y}`,
+          x: previousPoint.twoD!.x,
+          y: previousPoint.twoD!.y,
+          uuid: `point-null-${previousPoint.twoD!.x}-${previousPoint.twoD!.y}`,
         } satisfies PreviewGeometry
         previewGeoms.push(p)
       }
@@ -111,7 +125,7 @@
     stack = []
   }
 
-  function popFromStack(): Point2WithID | undefined {
+  function popFromStack(): PointLikeById | undefined {
     return stack.pop()
   }
 </script>
diff --git a/applications/web/src/components/tools/NewRectangle.svelte b/applications/web/src/components/tools/NewRectangle.svelte
index 5e2db1fd..d51915dc 100644
--- a/applications/web/src/components/tools/NewRectangle.svelte
+++ b/applications/web/src/components/tools/NewRectangle.svelte
@@ -2,13 +2,11 @@
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
   import {addRectangleBetweenPoints, addPointToSketch} from "shared/projectUtils"
   import {Vector3} from "three"
-  import type {IDictionary, PointLikeById, ProjectToPlane} from "shared/types"
-  import type { Point2 } from "cadmium"
+  import type {IDictionary, PointLikeById, ProjectToPlane, SketchPoint} from "shared/types"
 
-  // @ts-ignore
   const log = (function () { const context = "[NewRectangleTool.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
-  export let pointsById: IDictionary<Point2>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
+  export let pointsById: IDictionary<SketchPoint>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
 
   let anchorPoint: PointLikeById | null = null
 
@@ -34,7 +32,7 @@
       default:
         const endPoint = popFromStack()
         const anchor = popFromStack()
-        addRectangleBetweenPoints(sketchIndex, +anchor!.id!, +endPoint!.id!)
+        addRectangleBetweenPoints(sketchIndex, +anchor.id, +endPoint.id)
         clearStack()
         break
     }
diff --git a/applications/web/src/components/tools/Select.svelte b/applications/web/src/components/tools/Select.svelte
index e8ae9e63..719dc3c9 100644
--- a/applications/web/src/components/tools/Select.svelte
+++ b/applications/web/src/components/tools/Select.svelte
@@ -2,7 +2,6 @@
   import {currentlyMousedOver, currentlySelected} from "shared/stores"
   import {deleteEntities} from "shared/projectUtils"
 
-  // @ts-ignore
   const log = (function () { const context = "[SelectTool.svelte]"; const color="gray"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`)})() // prettier-ignore
 
   export let sketchIndex: string, active: boolean
diff --git a/applications/web/tests/e2e/test.ts b/applications/web/tests/e2e/test.ts
index a61fa498..10607458 100644
--- a/applications/web/tests/e2e/test.ts
+++ b/applications/web/tests/e2e/test.ts
@@ -11,7 +11,7 @@ test("has history pane", async ({page}) => {
   await expect(page.getByText("History")).toBeVisible()
 })
 
-test.skip("has origin in history panel", async ({page}) => {
+test("has origin in history panel", async ({page}) => {
   await page.goto("")
   await expect(page.getByText("origin")).toBeVisible()
 })
diff --git a/package.json b/package.json
index 3de31721..236946f3 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,6 @@
     "dev": "turbo run dev --no-daemon",
     "preview": "turbo run preview --no-daemon",
     "test": "turbo run test --no-daemon",
-    "test:unit": "turbo run test:unit --no-daemon",
-    "test:e2e": "turbo run test:e2e --no-daemon",
-    "test:rust": "cargo test",
     "clean": "turbo run clean --no-daemon",
     "lint": "turbo run lint --no-daemon",
     "format": "prettier --write \"**/*.{js,cjs,mjs,ts,tsx,json,svelte,md}\""
diff --git a/packages/cadmium-macros/Cargo.toml b/packages/cadmium-macros/Cargo.toml
deleted file mode 100644
index b5ac1f56..00000000
--- a/packages/cadmium-macros/Cargo.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-[package]
-name = "cadmium-macros"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-syn = { version = "1.0", features = ["parsing", "derive"] }
-quote = "1.0"
-proc-macro2 = "1.0"
-convert_case = "0.6.0"
-
-[lib]
-proc-macro = true
diff --git a/packages/cadmium-macros/src/lib.rs b/packages/cadmium-macros/src/lib.rs
deleted file mode 100644
index aa314eb4..00000000
--- a/packages/cadmium-macros/src/lib.rs
+++ /dev/null
@@ -1,247 +0,0 @@
-use convert_case::{Case, Casing};
-use quote::{format_ident, quote, ToTokens};
-use syn::{parse_macro_input, DeriveInput, ItemFn, Meta, NestedMeta, Type};
-
-#[proc_macro_derive(MessageEnum)]
-pub fn message_handler_derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-    let name = input.ident;
-    let data = match input.data {
-        syn::Data::Enum(data) => data,
-        _ => panic!("MessageEnum can only be derived for enums"),
-    };
-
-    let variants_typescript = data
-        .variants
-        .iter()
-        .map(|variant| {
-            let syn::Fields::Unnamed(field) = &variant.fields else {
-                panic!("MessageEnum can only be derived for enums with unnamed fields");
-            };
-
-            let field_type = &field.unnamed[0].ty;
-
-            variant_to_typescript(field_type.clone())
-        })
-        .collect::<Vec<(_, Vec<_>)>>();
-    let variants_typescript_type = variants_typescript
-        .clone()
-        .iter()
-        .map(|v| v.0.clone())
-        .collect::<Vec<_>>();
-    let variants_typescript_additional = variants_typescript
-        .clone()
-        .iter()
-        .map(|v| v.1.clone())
-        .collect::<Vec<_>>();
-
-    let variants_type = data
-        .variants
-        .iter()
-        .map(|variant| {
-            let syn::Fields::Unnamed(field) = &variant.fields else {
-                panic!("MessageEnum can only be derived for enums with unnamed fields");
-            };
-
-            let field_type = &field.unnamed[0].ty;
-            quote! { #field_type }
-        })
-        .collect::<Vec<_>>();
-
-    let variants = data
-        .variants
-        .iter()
-        .map(|variant| {
-            println!("Message Handler: {}", variant.ident);
-            let variant_name = &variant.ident;
-
-            quote! {
-                #name::#variant_name(msg)
-            }
-        })
-        .collect::<Vec<_>>();
-
-    let variant_names = data
-        .variants
-        .iter()
-        .map(|variant| &variant.ident)
-        .collect::<Vec<_>>();
-    let variants_clone = variants.clone();
-    let variants_clone2 = variants.clone();
-
-    quote! {
-        impl #name {
-            pub fn handle(&self, project: &mut crate::project::Project) -> anyhow::Result<Option<crate::step::StepHash>> {
-                match self {
-                    #( #variants_clone => msg.handle_project_message(project), )*
-                }
-            }
-        }
-
-        #(
-            impl From<#variants_type> for #name {
-                fn from(msg: #variants_type) -> Self {
-                    #variants_clone2
-                }
-            }
-        )*
-
-        impl std::fmt::Display for #name {
-            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                match self {
-                    #( #variants => write!(f, stringify!(#variant_names)), )*
-                }
-            }
-        }
-
-        use crate::message::Identifiable;
-        impl crate::Project {
-            pub fn gen_typescript_defs() -> Vec<(&'static str, Vec<String>)> {
-                let mut result = vec![];
-
-                #(
-                let inner_decl = #variants_typescript_type::DECL;
-                let interface_right_iter = inner_decl.split("{").collect::<Vec<_>>();
-                let interface_right = interface_right_iter.get(1).unwrap();
-                let only_interface_iter = interface_right.split("}").collect::<Vec<_>>();
-                let only_interface = only_interface_iter.get(0).unwrap();
-                let inner_fields = only_interface.split(";").map(|f| f.trim().to_string()).collect::<Vec<_>>();
-                let mut additional = vec![ #( format!("{}: StepHash", #variants_typescript_additional) ),* ];
-                additional.extend(inner_fields.clone());
-
-                result.push((stringify!(#variant_names), additional));
-                )*
-
-                result
-            }
-        }
-    }.into()
-}
-
-#[proc_macro_attribute]
-pub fn message(
-    attr: proc_macro::TokenStream,
-    item: proc_macro::TokenStream,
-) -> proc_macro::TokenStream {
-    let args = parse_macro_input!(attr as syn::AttributeArgs);
-    let input = parse_macro_input!(item as ItemFn);
-
-    // Extract the function name and arguments
-    let fn_name = &input.sig.ident;
-    let fn_args = &input.sig.inputs;
-    let mut parent_opt = None;
-    let mut rename_parent = None;
-
-    for arg in args.iter() {
-        match arg {
-            NestedMeta::Meta(Meta::Path(path)) => {
-                parent_opt =
-                    Some(path.get_ident().expect(
-                        "Parent type mut be an identifier (e.g. ISketch, not crate::ISketch)",
-                    ));
-            }
-            NestedMeta::Meta(Meta::NameValue(name_value)) => {
-                if name_value.path.is_ident("rename_parent") {
-                    let syn::Lit::Str(ref rename_parent_val) = name_value.lit else {
-                        panic!("rename_parent must be a string literal")
-                    };
-                    rename_parent = Some(rename_parent_val.value());
-                }
-            }
-            _ => panic!("Invalid attribute argument"),
-        }
-    }
-
-    // Create a struct name based on the function name
-    let parent = parent_opt.expect("Parent type must be specified");
-    let struct_name = if let Some(rename_parent) = rename_parent {
-        format_ident!(
-            "{}{}Message",
-            rename_parent,
-            fn_name.to_string().to_case(Case::Pascal)
-        )
-    } else {
-        format_ident!(
-            "{}{}Message",
-            parent,
-            fn_name.to_string().to_case(Case::Pascal)
-        )
-    };
-
-    // Generate struct fields from function arguments
-    let fields = fn_args.iter().map(|arg| {
-        if let syn::FnArg::Typed(pat_type) = arg {
-            let pat = &pat_type.pat;
-            let ty = &pat_type.ty;
-            quote! {
-                pub #pat: #ty,
-            }
-        } else {
-            quote!()
-        }
-    });
-    let parameters = fn_args.iter().filter_map(|arg| {
-        if let syn::FnArg::Typed(pat_type) = arg {
-            let pat = &pat_type.pat;
-            Some(quote! { #pat })
-        } else {
-            None
-        }
-    });
-
-    quote! {
-        impl #parent {
-            #input
-        }
-
-        #[derive(tsify_next::Tsify, Debug, Clone, serde::Serialize, serde::Deserialize)]
-        #[tsify(from_wasm_abi, into_wasm_abi)]
-        pub struct #struct_name {
-            #(#fields)*
-        }
-
-        impl crate::message::MessageHandler for #struct_name {
-            type Parent = Rc<RefCell<#parent>>;
-            fn handle_message(&self, parent_ref: Self::Parent) -> anyhow::Result<Option<(IDType, StepResult)>> {
-                parent_ref.borrow_mut().#fn_name( #(self.#parameters.clone()),* )
-            }
-        }
-    }.into()
-}
-
-fn variant_to_typescript(field_type: Type) -> (Type, Vec<proc_macro2::TokenStream>) {
-    let mut inner_type = field_type.clone();
-    let mut type_str = field_type.clone().to_token_stream().to_string();
-    let mut idwrap_types = vec![];
-
-    while type_str.starts_with("IDWrap") {
-        let idwrap_type = get_idwrap_type(inner_type);
-        inner_type = idwrap_type.clone();
-        idwrap_types.push(idwrap_type.clone());
-        type_str = idwrap_type.to_token_stream().to_string();
-    }
-
-    let additional_types = idwrap_types
-        .iter()
-        .map(|idwrap_type| {
-            quote! {<#idwrap_type as crate::message::MessageHandler>::Parent::ID_NAME }
-        })
-        .collect::<Vec<proc_macro2::TokenStream>>();
-
-    (inner_type, additional_types)
-}
-
-fn get_idwrap_type(field_type: Type) -> Type {
-    let Type::Path(inner_path) = field_type else {
-        panic!("IDWrap type argument must be a path type");
-    };
-    let inner_type_args = &inner_path.path.segments.first().unwrap().arguments;
-    let syn::PathArguments::AngleBracketed(idwrap_generic) = inner_type_args else {
-        panic!("IDWrap type argument must be a generic type");
-    };
-    let syn::GenericArgument::Type(idwrap_generic_type) = idwrap_generic.args.first().unwrap()
-    else {
-        panic!("IDWrap type argument must be a path type");
-    };
-    idwrap_generic_type.clone()
-}
diff --git a/packages/cadmium/.cargo/cargo.toml b/packages/cadmium/.cargo/cargo.toml
deleted file mode 100644
index cb2f0347..00000000
--- a/packages/cadmium/.cargo/cargo.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[env]
-RUST_BACKTRACE = 1
-RUST_LIB_BACKTRACE = 0
diff --git a/packages/cadmium/Cargo.toml b/packages/cadmium/Cargo.toml
index 0bce9ffa..e191311c 100644
--- a/packages/cadmium/Cargo.toml
+++ b/packages/cadmium/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 repository = "https://github.com/mattferraro/cadmium"
 authors = ["Matt Ferraro"]
 description = "A CAD program written in Rust with a JS front end"
-default-run = "cadmium"
 license = "Elastic License 2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,7 +12,7 @@ license = "Elastic License 2.0"
 [dependencies]
 console_error_panic_hook = "0.1.7"
 wasm-bindgen = "0.2.87"
-tsify-next = "0.5.3"
+tsify = "0.4.5"
 truck-meshalgo = { git = "https://github.com/ricosjp/truck.git", rev = "c84318b8dec" }
 truck-modeling = { git = "https://github.com/ricosjp/truck.git", rev = "c84318b8dec" }
 truck-shapeops = { git = "https://github.com/ricosjp/truck.git", rev = "c84318b8dec" }
@@ -22,40 +21,15 @@ truck-topology = { git = "https://github.com/ricosjp/truck.git", rev = "c84318b8
 truck-stepio = { git = "https://github.com/ricosjp/truck.git", rev = "c84318b8dec" }
 serde_json = "1.0.117"
 serde = "1.0.202"
-itertools = "0.13.0"
-svg = "0.17.0"
-geo = "0.28.0"
+itertools = "0.12.0"
+svg = "0.13.1"
+geo = "0.26.0"
 serde_with = "3.4.0"
 crc32fast = "1.3.2"
 indexmap = "2.1.0"
 anyhow = { version = "1.0.86", features = ["backtrace"] }
 thiserror = "1.0.61"
 strum = { version = "0.26.2", features = ["derive"] }
-isotope = { git = "https://github.com/CADmium-Co/ISOtope.git", version = "*", features = [
-	"tsify",
-] }
-paste = "1.0.15"
-cadmium-macros = { path = "../cadmium-macros", version = "*" }
-log = "0.4.21"
-wasm-logger = "0.2.0"
-convert_case = "0.6"
-xxhash-rust = { version = "0.8.10", features = ["xxh3"] }
-js-sys = "0.3.69"
-tsify = { version = "0.4.5", features = ["js", "wasm-bindgen"], default-features = false }
 
 [lib]
 crate-type = ["cdylib", "rlib"]
-
-[features]
-default = []
-bench-faceselector-report = []
-
-[[bin]]
-name = "gen-types"
-
-[[bench]]
-name = "faceselector-report"
-harness = false
-
-[dev-dependencies]
-svg = "0.17.0"
diff --git a/packages/cadmium/README.md b/packages/cadmium/README.md
index 3f404ad7..0a9bad99 100644
--- a/packages/cadmium/README.md
+++ b/packages/cadmium/README.md
@@ -1,93 +1,5 @@
-# CADmium Core
+# To Build
 
-This is the heart of CADmium. It's a wrapper around [ISOtope](https://github.com/CADmium-Co/ISOtope)
-2D constraint solver and [Truck](https://github.com/ricosjp/truck) 3D CAD kernel.
-
-It essentially holds the state for both of these libraries, provides a central
-way to interact with them and provides a consistent way to reconstruct objects
-with them.
-
-It's written in Rust and its main build target is WebAssembly.
-
-## Building
-
-After doing `pnpm install` in the root of the repository, you can build this
-package by running `pnpm build` in this directory.
-
-There's also a `pnpm dev` command that will watch for changes and rebuild the
-project as needed.
-
-## Testing
-
-You can run the tests for this package by running `pnpm test` in this directory.
-
-## Design
-
-The whole library is designed around the concept of parent-child relationships.
-
-At the root of the library is the `project::Project` struct which describes the
-whole project. This struct holds all the workbenches.
-
-A `workbench::Workbench` is the collection of all the history of a part of the project,
-as well as the result of the whole history, which is an array of points, planes,
-sketches and features (i.e. objects).
-
-A project has multiple workbenches and a workbench has multiple objects and sketches.
-
-Each `isketch::ISketch` (distinct from `isotope::sketch::Sketch`) holds an
-`isotope::sketch::Sketch` and is able to act on it.
-
-Each `solid::point::Point3` is a point in 3D space, created manually, outside
-of any sketch.
-
-Each `solid::plane::Plane` is a plane in 3D space, created either manually or
-on top of a face of a solid.
-
-Each `solid::solid::Solid` is a solid in 3D space created by one or more features
-(e.g. extrude, revolve, etc.).
-
-### Messages
-
-The library is designed to be used in a message-passing way.
-
-Throughout the library, you'll see a lot of structs that implement
-the `MessageHandler` trait and are part of the `message::Message` enum.
-
-These can be thought as commands (e.g. `isketch::AddPoint` or `solid::extrusion::Add`)
-that act on the state of the library.
-
-Each `MessageHandler` has a `Parent` type, which is what it acts on.
-
-For example an `isketch::AddPoint` message acts on an `isketch::ISketch`
-to mutate its `isotope::sketch::Sketch` and a `workbench::AddSketch`
-acts on a `workbench::Workbench` to mutate it list of sketches.
-
-Each `MessageHandler` can return one of the following:
-
-- `Ok(Some(IDType))`: The handling was successful and the ID of the new item
-  is returned (e.g. for `isketch::AddPoint`).
-- `Ok(None)`: The handling was successful and no new item was created (e.g. for
-  `isketch::DeletePrimitive`).
-- `Err(Error)`: The handling was unsuccessful and an error is returned.
-
-### Rendering the current state
-
-Essentially each `workbench::Workbench` represents the current state of the part
-of the project the user is working on and after each message, it gets updated.
-
-Calling `project.get_workbench_by_id(id)` should have all the information needed
-to render the current state of that part.
-
-### History
-
-Every time a message is handled that changes the state of a `workbench::Workbench`,
-a `step::Step` is created and added to the `workbench::Workbench.history`.
-
-Each `step::Step` holds a `message::Message`, a name, an ID (which is just the index
-of the step in the history) and a `suppressed` boolean.
-
-When showing the history to the user, the `name` should be used to describe the step,
-the `suppressed` boolean should be used to show if the step is suppressed,
-and the `message::Message` variant should be used to show what the step did,
-its arguments and its possible actions (e.g. `solid::extrusion::Add` should show
-the extrusion icon with the ability to change length, direction, etc.).
+```bash
+npm run wasm
+```
diff --git a/packages/cadmium/benches/faceselector-report/draw.rs b/packages/cadmium/benches/faceselector-report/draw.rs
deleted file mode 100644
index 3edba3c7..00000000
--- a/packages/cadmium/benches/faceselector-report/draw.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use svg::node::element::path::Data;
-use svg::node::element::Path as SvgPath;
-
-use cadmium::isketch::face::FaceSelector;
-use cadmium::project::Project;
-use cadmium::IDType;
-
-use crate::FaceSelectorType;
-
-pub const COLORS: [&str; 6] = [
-    "#FF0000", "#00FF00", "#0000FF", "#FFFF00", "#FF00FF", "#00FFFF",
-];
-
-pub fn draw_sketch_faces(
-    p: &mut Project,
-    selector: &FaceSelectorType,
-    sketch_id: IDType,
-    name: String,
-) {
-    let wb_ref = p.get_workbench_by_id(0).unwrap();
-    let wb = wb_ref.borrow();
-    let sketch_ref = wb.get_sketch_by_id(sketch_id).unwrap();
-    let sketch = sketch_ref.borrow();
-
-    let all_faces = sketch.sketch().borrow().get_merged_faces();
-    let faces = selector.get_selected_faces(&sketch);
-
-    // viewBox is min-x, min-y, width, height
-    let mut svg_doc = svg::Document::new().set("viewBox", (-50, -50, 100, 100));
-
-    for (i, face) in all_faces.iter().enumerate() {
-        let polygon = face.as_polygon();
-        let color = COLORS[i % COLORS.len()];
-        let selected = faces.contains(face);
-        println!("Selected: {}", selected);
-
-        svg_doc = svg_doc.add(draw_polygon(&polygon, color, selected));
-    }
-
-    svg::save(format!("bench-faceselector-report/{}.svg", name), &svg_doc).unwrap();
-}
-
-pub fn draw_polygon(polygon: &geo::Polygon<f64>, color: &str, selected: bool) -> SvgPath {
-    let mut data = Data::new();
-
-    for line in polygon.exterior().lines() {
-        data = data.move_to((line.start.x, line.start.y));
-        data = data.line_to((line.end.x, line.end.y));
-    }
-
-    for hole in polygon.interiors() {
-        for line in hole.lines() {
-            data = data.move_to((line.start.x, line.start.y));
-            data = data.line_to((line.end.x, line.end.y));
-        }
-    }
-    data = data.close();
-
-    SvgPath::new()
-        // TODO: Fill doesn't work!
-        .set("fill", color)
-        .set("fill-opacity", if selected { "0.5" } else { "0" })
-        .set("stroke", color)
-        .set("stroke-width", 1)
-        .set("d", data)
-}
diff --git a/packages/cadmium/benches/faceselector-report/main.rs b/packages/cadmium/benches/faceselector-report/main.rs
deleted file mode 100644
index 8844c796..00000000
--- a/packages/cadmium/benches/faceselector-report/main.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-use std::fs;
-
-use cadmium::archetypes::PlaneDescription;
-use cadmium::isketch::face::FaceSelector;
-use cadmium::isketch::primitive::SketchAddPointMessage;
-use cadmium::message::idwrap::IDWrap;
-use cadmium::message::ProjectMessageHandler;
-use cadmium::project::Project;
-use cadmium::workbench::AddSketch;
-use cadmium::IDType;
-
-pub trait TestCase: std::fmt::Debug {
-    fn pre_selection(&self, p: &mut Project, sketch_id: IDType);
-    fn post_selection(&self, p: &mut Project, sketch_id: IDType);
-}
-
-mod draw;
-mod report;
-
-mod simple_circles;
-
-use draw::*;
-use report::*;
-
-fn create_project() -> (Project, IDType) {
-    let mut p = Project::new("Test Project");
-    let plane_description = PlaneDescription::PlaneId(0);
-    let sketch_id = IDWrap {
-        id: 0,
-        inner: AddSketch { plane_description },
-    }
-    .handle_project_message(&mut p)
-    .unwrap()
-    .unwrap();
-    IDWrap {
-        id: 0,
-        inner: IDWrap {
-            id: sketch_id,
-            inner: SketchAddPointMessage { x: 0.0, y: 0.0 },
-        },
-    }
-    .handle_project_message(&mut p)
-    .unwrap()
-    .unwrap();
-
-    (p, sketch_id)
-}
-
-#[derive(Debug)]
-pub enum FaceSelectorType {
-    ID(cadmium::isketch::face::IDSelector),
-    Centroid(cadmium::isketch::face::CentroidSelector),
-}
-
-impl FaceSelector for FaceSelectorType {
-    fn get_selected_faces(
-        &self,
-        isketch: &cadmium::isketch::ISketch,
-    ) -> Vec<cadmium::isketch::face::Face> {
-        match self {
-            FaceSelectorType::ID(selector) => selector.get_selected_faces(isketch),
-            FaceSelectorType::Centroid(selector) => selector.get_selected_faces(isketch),
-        }
-    }
-
-    fn from_face_ids(_sketch: &cadmium::isketch::ISketch, _ids: Vec<IDType>) -> Self {
-        unimplemented!()
-    }
-}
-
-fn main() {
-    // Create report dir
-    fs::create_dir_all("bench-faceselector-report").unwrap();
-
-    let mut results = vec![];
-    let cases: Vec<(Box<dyn TestCase>, IDType)> = vec![
-        (Box::new(simple_circles::SingleCircle()), 0),
-        (Box::new(simple_circles::SingleCircleAddAnother()), 0),
-    ];
-    for case in cases.iter() {
-        let (case_struct, index) = case;
-        let (mut p, sketch_id) = create_project();
-
-        case_struct.pre_selection(&mut p, sketch_id);
-        let sketch_ref = p
-            .get_workbench_by_id(0)
-            .unwrap()
-            .borrow()
-            .get_sketch_by_id(sketch_id)
-            .unwrap();
-
-        let selectors = vec![
-            FaceSelectorType::ID(cadmium::isketch::face::IDSelector::from_face_ids(
-                &sketch_ref.borrow(),
-                vec![*index],
-            )),
-            FaceSelectorType::Centroid(cadmium::isketch::face::CentroidSelector::from_face_ids(
-                &sketch_ref.borrow(),
-                vec![*index],
-            )),
-        ];
-
-        for selector in selectors.iter() {
-            println!("Drawing faces for selector: {:?}", selector);
-            let case_name = format!("{:?}", case_struct);
-            let selector_name_full = format!("{:?}", selector);
-            let selector_name_variant = selector_name_full.split_once(" ").unwrap().0;
-            let selector_name = selector_name_variant.split_once("(").unwrap().1;
-            let name = format!("{}_{}", selector_name, case_name);
-            results.push((
-                selector_name.to_string(),
-                case_name.to_string(),
-                name.clone(),
-            ));
-
-            draw_sketch_faces(&mut p, selector, *index, format!("{}_before", name));
-        }
-
-        case_struct.post_selection(&mut p, sketch_id);
-
-        for (id, selector) in selectors.iter().enumerate() {
-            let name = results[id].2.clone();
-            println!("Name: {}", name);
-            draw_sketch_faces(&mut p, selector, *index, format!("{}_after", name));
-        }
-    }
-
-    println!("results: {:?}", results);
-    save_report_html(results);
-}
diff --git a/packages/cadmium/benches/faceselector-report/report.rs b/packages/cadmium/benches/faceselector-report/report.rs
deleted file mode 100644
index ebce82c0..00000000
--- a/packages/cadmium/benches/faceselector-report/report.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-use std::fs;
-
-// CSS from https://developer.mozilla.org/en-US/docs/Web/HTML/Element/table
-const HTML_HEAD: &str = r#"
-        <style>
-table {
-  border-collapse: collapse;
-  border: 2px solid rgb(140 140 140);
-  font-family: sans-serif;
-  font-size: 0.8rem;
-  letter-spacing: 1px;
-}
-thead,
-tfoot {
-  background-color: rgb(228 240 245);
-}
-
-th,
-td {
-  border: 1px solid rgb(160 160 160);
-  padding: 8px 10px;
-}
-
-td:last-of-type {
-  text-align: center;
-}
-
-tbody > tr:nth-of-type(even) {
-  background-color: rgb(237 238 242);
-}
-        </style>
-        <table>
-            <thead>
-                <tr>
-                    <th>Selector</th>
-                    <th>Case</th>
-                    <th>Before</th>
-                    <th>After</th>
-                </tr>
-            </thead>
-            <tbody>
-"#;
-const HTML_FOOT: &str = "</tbody></table>";
-
-pub fn save_report_html(results: Vec<(String, String, String)>) {
-    let mut report = HTML_HEAD.to_string();
-
-    for (selector, case, name) in results.iter() {
-        report.push_str(&format!(
-            r#"
-            <tr>
-                <td>{selector}</td>
-                <td>{case}</td>
-                <td><a href="{name}_before.svg"><img width="200" src="{name}_before.svg" /></a></td>
-                <td><a href="{name}_after.svg"><img width="200" src="{name}_after.svg" /></a></td>
-            </tr>
-        "#
-        ))
-    }
-
-    report.push_str(HTML_FOOT);
-    fs::write("bench-faceselector-report/index.html", report).unwrap();
-}
diff --git a/packages/cadmium/benches/faceselector-report/simple_circles.rs b/packages/cadmium/benches/faceselector-report/simple_circles.rs
deleted file mode 100644
index dec51692..00000000
--- a/packages/cadmium/benches/faceselector-report/simple_circles.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use cadmium::isketch::primitive::AddCircle;
-use cadmium::message::idwrap::IDWrap;
-use cadmium::message::ProjectMessageHandler;
-use cadmium::IDType;
-
-use crate::TestCase;
-
-#[derive(Debug)]
-pub struct SingleCircle();
-impl TestCase for SingleCircle {
-    fn pre_selection(&self, p: &mut cadmium::project::Project, sketch_id: IDType) {
-        IDWrap {
-            id: 0,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddCircle {
-                    center: 0,
-                    radius: 10.0,
-                },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-    }
-    fn post_selection(&self, _p: &mut cadmium::project::Project, _sketch_id: IDType) {}
-}
-
-#[derive(Debug)]
-pub struct SingleCircleAddAnother();
-impl TestCase for SingleCircleAddAnother {
-    fn pre_selection(&self, p: &mut cadmium::project::Project, sketch_id: IDType) {
-        SingleCircle().pre_selection(p, sketch_id)
-    }
-    fn post_selection(&self, p: &mut cadmium::project::Project, sketch_id: IDType) {
-        IDWrap {
-            id: 0,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddCircle {
-                    center: 0,
-                    radius: 20.0,
-                },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-    }
-}
diff --git a/packages/cadmium/examples/project_simple_extrusion.rs b/packages/cadmium/examples/project_simple_extrusion.rs
index c3f70127..e0588b3b 100644
--- a/packages/cadmium/examples/project_simple_extrusion.rs
+++ b/packages/cadmium/examples/project_simple_extrusion.rs
@@ -1,83 +1,35 @@
-use cadmium::archetypes::PlaneDescription;
-use cadmium::feature::extrusion::{self, Direction, Mode};
-use cadmium::isketch::primitive::{AddLine, SketchAddPointMessage};
-use cadmium::message::idwrap::IDWrapable;
-use cadmium::message::MessageHandler as _;
-use cadmium::message::ProjectMessageHandler;
-use cadmium::project::Project;
-use cadmium::step::{StepHash, StepResult};
-use cadmium::workbench::AddSketch;
+use cadmium::{
+    extrusion::{Direction, Extrusion, ExtrusionMode},
+    project::Project,
+};
 
 fn main() {
-    let mut p = Project::new("Test Project");
-    let wb_hash = StepHash::from_int(0);
-    let plane_description = PlaneDescription::PlaneId(0);
-    let sketch_id = AddSketch { plane_description }
-        .id_wrap(wb_hash)
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-
-    let wb_ref = p.workbenches.first().unwrap().clone();
-    let step = wb_ref.borrow().get_step_by_hash(sketch_id).unwrap();
-
-    let StepResult::Sketch(sketch) = step.borrow().result.clone() else {
-        panic!("Expected a sketch");
-    };
-
-    let ll = SketchAddPointMessage { x: 0.0, y: 0.0 }
-        .id_wrap(sketch_id)
-        .id_wrap(wb_hash)
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-    let lr = SketchAddPointMessage { x: 40.0, y: 0.0 }
-        .id_wrap(sketch_id)
-        .id_wrap(wb_hash)
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-    let ul = SketchAddPointMessage { x: 0.0, y: 40.0 }
-        .id_wrap(sketch_id)
-        .id_wrap(wb_hash)
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-    let ur = SketchAddPointMessage { x: 40.0, y: 40.0 }
-        .id_wrap(sketch_id)
-        .id_wrap(wb_hash)
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-
-    AddLine { start: ll, end: lr }
-        .handle_message(sketch.clone())
-        .unwrap();
-    AddLine { start: lr, end: ur }
-        .handle_message(sketch.clone())
-        .unwrap();
-    AddLine { start: ur, end: ul }
-        .handle_message(sketch.clone())
-        .unwrap();
-    AddLine { start: ul, end: ll }
-        .handle_message(sketch.clone())
-        .unwrap();
-
-    extrusion::Add {
-        sketch_id,
-        faces: vec![0],
-        length: 25.0,
-        offset: 0.0,
-        direction: Direction::Normal,
-        mode: Mode::New,
-    }
-    .handle_message(wb_ref.clone())
-    .unwrap();
-
-    let wb = wb_ref.borrow();
-    let feature_ref = wb.features.first_key_value().unwrap().1;
-    let solid_like = feature_ref.borrow().as_solid_like().to_solids().unwrap();
-    let solid = solid_like.get(0).unwrap();
+    let mut p = Project::new("Example Project");
+    let wb = p.workbenches.get_mut(0).unwrap();
+    wb.add_sketch_to_plane("Sketch 1", "Plane-0");
+    let s = wb.get_sketch_mut("Sketch 1").unwrap();
+    let ll = s.add_point(0.0, 0.0);
+    let lr = s.add_point(40.0, 0.0);
+    let ul = s.add_point(0.0, 40.0);
+    let ur = s.add_point(40.0, 40.0);
+    s.add_segment(ll, lr);
+    s.add_segment(lr, ur);
+    s.add_segment(ur, ul);
+    s.add_segment(ul, ll);
+
+    let extrusion = Extrusion::new(
+        "Sketch-0".to_owned(),
+        vec![0],
+        25.0,
+        0.0,
+        Direction::Normal,
+        ExtrusionMode::New,
+    );
+    wb.add_extrusion("Ext1", extrusion);
+
+    let realization = p.get_realization(0, 1000);
+    let solids = realization.solids;
+    let solid = &solids["Ext1:0"];
 
     println!("{:?}", solid);
 
diff --git a/packages/cadmium/package.json b/packages/cadmium/package.json
index 0d2dbf54..28ab7e90 100644
--- a/packages/cadmium/package.json
+++ b/packages/cadmium/package.json
@@ -6,8 +6,8 @@
   "description": "A CAD program written in Rust with a JS front end",
   "scripts": {
     "dev": "pnpm build:dev && onchange 'src/**/*.rs' -- pnpm build:dev",
-    "build:dev": "cross-env cargo check && wasm-pack build --no-pack --target web --dev",
-    "build": "cross-env cargo run --release --bin gen-types && wasm-pack build --target web --no-pack",
+    "build:dev": "cross-env cargo check && set RUST_BACKTRACE=1 wasm-pack build --no-pack --target web --dev",
+    "build": "wasm-pack build --target web --no-pack",
     "clean": "rimraf target pkg node_modules",
     "test": "cargo test",
     "postinstall": "pnpm build"
diff --git a/packages/cadmium/src/archetypes.rs b/packages/cadmium/src/archetypes.rs
index 2103c073..3440a0c6 100644
--- a/packages/cadmium/src/archetypes.rs
+++ b/packages/cadmium/src/archetypes.rs
@@ -1,18 +1,15 @@
-use isotope::primitives::point2::Point2 as ISOPoint2;
+use tsify::Tsify;
 use serde::{Deserialize, Serialize};
-use truck_modeling::InnerSpace;
 use truck_modeling::Plane as TruckPlane;
-use tsify_next::Tsify;
+use truck_modeling::InnerSpace;
 
-use crate::feature::point::Point3;
-use crate::step::StepHash;
-use crate::IDType;
+use crate::sketch::Point2;
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[derive(Tsify, Debug, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub enum PlaneDescription {
-    PlaneId(IDType),
-    SolidFace { solid_id: IDType, normal: Vector3 },
+    PlaneId(String),
+    SolidFace { solid_id: String, normal: Vector3 },
 }
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
@@ -90,33 +87,20 @@ impl Plane {
         }
     }
 
-    pub fn project(&self, point: &Point3) -> ISOPoint2 {
+    pub fn project(&self, point: &Point3) -> Point2 {
         let minus_origin = point.minus(&self.origin);
         let x = minus_origin.dot(&self.primary);
         let y = minus_origin.dot(&self.secondary);
-        ISOPoint2::new(x, y)
+        Point2::new(x, y)
     }
 
-    pub fn unproject(&self, point: &ISOPoint2) -> Point3 {
-        let x = self.origin.plus(self.primary.times(point.x()));
-        let y = self.origin.plus(self.secondary.times(point.y()));
+    pub fn unproject(&self, point: &Point2) -> Point3 {
+        let x = self.origin.plus(self.primary.times(point.x));
+        let y = self.origin.plus(self.secondary.times(point.y));
         x.plus(y).to_point3()
     }
 }
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Vector2 {
-    pub x: f64,
-    pub y: f64,
-}
-
-impl Vector2 {
-    pub fn new(x: f64, y: f64) -> Self {
-        Vector2 { x, y }
-    }
-}
-
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Vector3 {
@@ -157,154 +141,67 @@ impl Vector3 {
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Line3 {
-    pub start: u64,
-    pub end: u64,
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Arc3 {
-    pub center: u64,
-    pub start: u64,
-    pub end: u64,
-    pub clockwise: bool,
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Circle3 {
-    pub center: u64,
-    pub radius: f64,
-    pub top: u64,
-}
-
-// --- ISOtope wrappers ---
-pub trait FromSketchPrimitive<T> {
-    fn from_sketch(sketch: &isotope::sketch::Sketch, primitive: &T) -> Self;
-}
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Point2 {
+pub struct Point3 {
     pub x: f64,
     pub y: f64,
+    pub z: f64,
     pub hidden: bool,
 }
 
-impl From<Point2> for ISOPoint2 {
-    fn from(val: Point2) -> Self {
-        ISOPoint2::new(val.x, val.y)
+impl Point3 {
+    pub fn new(x: f64, y: f64, z: f64) -> Self {
+        Point3 {
+            x,
+            y,
+            z,
+            hidden: false,
+        }
     }
-}
 
-impl FromSketchPrimitive<ISOPoint2> for Point2 {
-    fn from_sketch(_sketch: &isotope::sketch::Sketch, primitive: &ISOPoint2) -> Self {
-        Self {
-            x: primitive.x(),
-            y: primitive.y(),
-            hidden: false,
+    pub fn plus(&self, v: Vector3) -> Vector3 {
+        Vector3 {
+            x: self.x + v.x,
+            y: self.y + v.y,
+            z: self.z + v.z,
         }
     }
-}
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Arc2 {
-    pub center: StepHash,
-    pub radius: f64,
-    pub clockwise: bool,
-    pub start_angle: f64,
-    pub end_angle: f64,
-}
+    pub fn minus(&self, other: &Point3) -> Vector3 {
+        Vector3 {
+            x: self.x - other.x,
+            y: self.y - other.y,
+            z: self.z - other.z,
+        }
+    }
 
-// impl FromSketchPrimitive<ISOArc> for Arc2 {
-//     fn from_sketch(sketch: &isotope::sketch::Sketch, primitive: &ISOArc) -> Self {
-//         let center = sketch
-//             .get_primitive_id(&isotope::primitives::PrimitiveCell::Point2(
-//                 primitive.center(),
-//             ))
-//             .unwrap();
-//         Self {
-//             center,
-//             radius: primitive.radius(),
-//             clockwise: primitive.clockwise(),
-//             start_angle: primitive.start_angle(),
-//             end_angle: primitive.end_angle(),
-//         }
-//     }
-// }
+    pub fn distance_to(&self, other: &Point3) -> f64 {
+        let dx = self.x - other.x;
+        let dy = self.y - other.y;
+        let dz = self.z - other.z;
+        (dx * dx + dy * dy + dz * dz).sqrt()
+    }
+}
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Circle2 {
-    pub center: StepHash,
-    pub radius: f64,
+pub struct Line3 {
+    pub start: u64,
+    pub end: u64,
 }
 
-// impl FromSketchPrimitive<ISOCircle> for Circle2 {
-//     fn from_sketch(sketch: &isotope::sketch::Sketch, primitive: &ISOCircle) -> Self {
-//         let center = sketch
-//             .get_primitive_id(&isotope::primitives::PrimitiveCell::Point2(
-//                 primitive.center(),
-//             ))
-//             .unwrap();
-//         Self {
-//             center,
-//             radius: primitive.radius(),
-//         }
-//     }
-// }
-
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Line2 {
-    pub start: StepHash,
-    pub end: StepHash,
+pub struct Arc3 {
+    pub center: u64,
+    pub start: u64,
+    pub end: u64,
+    pub clockwise: bool,
 }
 
-// impl FromSketchPrimitive<ISOLine> for Line2 {
-//     fn from_sketch(sketch: &isotope::sketch::Sketch, primitive: &ISOLine) -> Self {
-//         let start_prim = sketch
-//             .get_primitive_id(&isotope::primitives::PrimitiveCell::Point2(
-//                 primitive.start(),
-//             ))
-//             .unwrap();
-//         let end_prim = sketch
-//             .get_primitive_id(&isotope::primitives::PrimitiveCell::Point2(primitive.end()))
-//             .unwrap();
-
-//         Self { start, end }
-//     }
-// }
-
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-#[serde(tag = "type")]
-pub enum WrappedPrimitive {
-    Point2(Point2),
-    Line2(Line2),
-    Arc2(Arc2),
-    Circle2(Circle2),
+pub struct Circle3 {
+    pub center: u64,
+    pub radius: f64,
+    pub top: u64,
 }
-
-// impl WrappedPrimitive {
-//     pub fn from_sketch(
-//         sketch: &isotope::sketch::Sketch,
-//         primitive: &isotope::primitives::Primitive,
-//     ) -> Self {
-//         match primitive {
-//             isotope::primitives::Primitive::Point2(p) => {
-//                 WrappedPrimitive::Point2(Point2::from_sketch(sketch, p))
-//             }
-//             isotope::primitives::Primitive::Line(l) => {
-//                 WrappedPrimitive::Line2(Line2::from_sketch(sketch, l))
-//             }
-//             isotope::primitives::Primitive::Arc(a) => {
-//                 WrappedPrimitive::Arc2(Arc2::from_sketch(sketch, a))
-//             }
-//             isotope::primitives::Primitive::Circle(c) => {
-//                 WrappedPrimitive::Circle2(Circle2::from_sketch(sketch, c))
-//             }
-//         }
-//     }
-// }
diff --git a/packages/cadmium/src/bin/gen-types.rs b/packages/cadmium/src/bin/gen-types.rs
deleted file mode 100644
index 47f991fc..00000000
--- a/packages/cadmium/src/bin/gen-types.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use std::io::Write;
-
-use convert_case::{Case, Casing};
-
-fn main() {
-    let mut output = std::fs::File::create("../shared/cadmium-api.ts").unwrap();
-
-    writeln!(
-        output,
-        "// This file is generated by the gen-types binary, do not edit"
-    )
-    .unwrap();
-    writeln!(output, "import {{ Direction, IDType, MessageResult, Mode, Plane, PlaneDescription, StepHash }} from \"cadmium\"").unwrap();
-    writeln!(
-        output,
-        "import {{ sendWasmMessage }} from \"./projectUtils\""
-    )
-    .unwrap();
-
-    let all_defs = cadmium::Project::gen_typescript_defs();
-
-    for (name, fields) in &all_defs {
-        let iface_fields = fields.join("; ");
-        let fn_name = name.to_case(Case::Camel);
-        let fn_params_full = fields.join(", ");
-        let fn_params = fn_params_full.trim_end_matches(", ");
-        let iface_params_full = fields
-            .iter()
-            .map(|f| f.split(":").next().unwrap().trim())
-            .collect::<Vec<_>>()
-            .join(", ");
-        let iface_params = iface_params_full.trim_end_matches(", ");
-
-        writeln!(
-            output,
-            r#"
-export interface {name} {{ {iface_fields} }}
-export function {fn_name}({fn_params}): MessageResult {{
-    const message: Message = {{ type: "{name}", {iface_params} }};
-    return sendWasmMessage(message);
-}}"#
-        )
-        .unwrap();
-    }
-
-    let message_variants = all_defs
-        .iter()
-        .map(|(name, _)| format!("{{ type: \"{name}\" }} & {name}"))
-        .collect::<Vec<_>>()
-        .join(" | ");
-
-    writeln!(output, "export type Message = {message_variants};").unwrap();
-}
diff --git a/packages/cadmium/src/error.rs b/packages/cadmium/src/error.rs
index 46340225..87939e3b 100644
--- a/packages/cadmium/src/error.rs
+++ b/packages/cadmium/src/error.rs
@@ -1,31 +1,36 @@
 use thiserror::Error;
 
+use crate::sketch::SketchFeatureType;
+
 #[derive(Error, Debug)]
 pub enum CADmiumError {
-    // Message errors
-    #[error("The workbench ID {0} was not found")]
-    WorkbenchIDNotFound(u64),
-    #[error("The workbench name {0} was not found")]
-    WorkbenchNameNotFound(String),
-    #[error("The step ID {0} was not found")]
-    StepIDNotFound(String),
-    #[error("The step name {0} was not found")]
-    StepNameNotFound(String),
-    #[error("The sketch ID {0} was not found")]
-    SketchIDNotFound(u64),
+	// Message errors
+	#[error("The workbench ID {0} was not found")]
+	WorkbenchIDNotFound(u64),
+	#[error("The workbench name {0} was not found")]
+	WorkbenchNameNotFound(String),
+	#[error("The step ID {0} was not found")]
+	StepIDNotFound(String),
+	#[error("The step name {0} was not found")]
+	StepNameNotFound(String),
+	#[error("The sketch ID {0} was not found")]
+	SketchIDNotFound(u64),
+
+	// StepData errors
+	#[error("The step {0} data type is not as expected")]
+	IncorrectStepDataType(String),
 
-    // RealSketch errors
-    #[error("The primitive could not be found inside the sketch")]
-    PrimitiveNotInSketch,
-    #[error("Couldn't calculate the 3D position of the supplied point")]
-    Point3DCalculationFailed,
-    #[error("The calculated 3D point was not found in the sketch")]
-    Point3DNotFound,
+	// Sketch errors
+	#[error("The {0} with ID {1} already exists in the sketch")]
+	SketchFeatureAlreadyExists(SketchFeatureType, u64),
+	#[error("The {0} ID is too low for {1}")]
+	SketchFeatureIDTooLow(SketchFeatureType, u64),
+	#[error("The {0} with ID {1} has a start point that doesn't exist in the current sketch")]
+	SketchFeatureMissingStart(SketchFeatureType, u64),
+	#[error("The {0} with ID {1} has an end point that doesn't exist in the current sketch")]
+	SketchFeatureMissingEnd(SketchFeatureType, u64),
 
-    // StepData errors
-    #[error("The step {0} data type is not as expected")]
-    IncorrectStepDataType(String),
 
-    #[error("This function is not implemented yet")]
-    NotImplemented,
+	#[error("This function is not implemented yet")]
+	NotImplemented,
 }
diff --git a/packages/cadmium/src/extrusion.rs b/packages/cadmium/src/extrusion.rs
new file mode 100644
index 00000000..5ba02980
--- /dev/null
+++ b/packages/cadmium/src/extrusion.rs
@@ -0,0 +1,447 @@
+use geo::Contains;
+use geo::InteriorPoint;
+use geo::Polygon;
+
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+
+use truck_polymesh::InnerSpace;
+use truck_polymesh::Invertible;
+use truck_polymesh::Tolerance;
+use truck_shapeops::ShapeOpsCurve;
+use truck_shapeops::ShapeOpsSurface;
+use truck_topology::Shell;
+
+use crate::archetypes::{Point3, Vector3};
+use crate::project::{RealPlane, RealSketch};
+use crate::sketch::{arc_to_points, Face, Sketch};
+
+use truck_modeling::{Plane, Point3 as TruckPoint3, Surface};
+
+use truck_topology::Solid as TruckSolid;
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Extrusion {
+    pub sketch_id: String,
+    pub face_ids: Vec<u64>,
+    pub length: f64,
+    pub offset: f64,
+    pub direction: Direction,
+    pub mode: ExtrusionMode,
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum ExtrusionMode {
+    New,
+    Add(Vec<String>),
+    Remove(Vec<String>),
+}
+
+impl Extrusion {
+    pub fn new(
+        sketch_id: String,
+        face_ids: Vec<u64>,
+        length: f64,
+        offset: f64,
+        direction: Direction,
+        mode: ExtrusionMode,
+    ) -> Self {
+        Extrusion {
+            sketch_id,
+            face_ids,
+            length,
+            offset,
+            direction,
+            mode,
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Direction {
+    Normal,
+    NegativeNormal,
+    Specified(Vector3),
+}
+
+pub fn find_enveloped_shapes(faces: &Vec<Face>) -> Vec<(usize, usize)> {
+    let mut retval = vec![];
+    for (a, face_a) in faces.iter().enumerate() {
+        for (b, face_b) in faces.iter().enumerate() {
+            if a == b {
+                continue;
+            }
+            let face_b_exterior = &face_b.exterior.canonical_form();
+
+            // check if b's exterior is equal to any of a's holes
+            for (_hole_index, hole) in face_a.holes.iter().enumerate() {
+                let hole = hole.canonical_form();
+
+                if face_b_exterior.equals(&hole) {
+                    retval.push((b, a)); // (small, big)
+                }
+            }
+        }
+    }
+
+    return retval;
+}
+
+pub fn merge_faces(faces: &Vec<Face>, real_sketch: &RealSketch) -> Vec<Face> {
+    // create  new sketch using these faces
+    let sketch = Sketch::from_faces(faces, real_sketch);
+
+    let (mut all_sketch_faces, _unused_segments) = sketch.find_faces();
+
+    // check whether each of these new faces should returned or not by picking a
+    // random point on the new face and then checking every one of the original faces
+    // to see if it contains that point. If so, we can keep that new face
+    let mut faces_to_remove: Vec<usize> = vec![];
+    let old_faces_as_polygons: Vec<Polygon> = faces
+        .iter()
+        .map(|face| sketch.face_as_polygon(face))
+        .collect::<Vec<_>>();
+    for (new_face_idx, face) in all_sketch_faces.iter().enumerate() {
+        // println!("\nNew face: {}: {:?}", new_face_idx, face);
+
+        let as_geo_polygon = sketch.face_as_polygon(face);
+        // println!("as_geo_polygon: {:?}", as_geo_polygon);
+
+        let random_point_on_face = as_geo_polygon
+            .interior_point()
+            .expect("Every polygon should be able to yield an interior point");
+        // println!("Random point on face: {:?}", random_point_on_face);
+
+        let mut located = false;
+        for (_old_face_idx, old_face) in old_faces_as_polygons.iter().enumerate() {
+            if old_face.contains(&random_point_on_face) {
+                // println!(
+                //     "Old face {} contains point {:?}",
+                //     old_face_idx, random_point_on_face
+                // );
+                // this means the old face contains the random point on the new face
+                // so we can keep this new face
+                located = true;
+                break;
+            }
+        }
+        if !located {
+            // println!(
+            //     "Random point from new face {} is not contained by any old faces",
+            //     new_face_idx
+            // );
+            faces_to_remove.push(new_face_idx);
+        }
+    }
+
+    // remove the faces that we don't want
+    faces_to_remove.sort();
+    faces_to_remove.reverse();
+    // println!("New Faces to remove: {:?}", faces_to_remove);
+    for face_to_remove in faces_to_remove {
+        all_sketch_faces.remove(face_to_remove);
+    }
+
+    // println!("Merge faces 2 output: {}", faces.len());
+    all_sketch_faces
+}
+
+// pub fn find_adjacent_shapes(faces: &Vec<Face>) -> Option<(usize, usize, Vec<usize>, Vec<usize>)> {
+//     for (a, face_a) in faces.iter().enumerate() {
+//         for (b, face_b) in faces.iter().enumerate() {
+//             if a == b || a > b {
+//                 continue;
+//             }
+
+//             let adjacent_edges = face_a.exterior.adjacent_edges(&face_b.exterior);
+
+//             match adjacent_edges {
+//                 None => continue,
+//                 Some(matched_edges) => return Some((a, b, matched_edges.0, matched_edges.1)),
+//             }
+//         }
+//     }
+
+//     None
+// }
+
+// pub fn merge_faces(faces: Vec<Face>) -> Vec<Face> {
+//     let mut faces = faces.clone();
+//     // adjacency:
+//     // check if this shape's exterior is adjacent to any other shape's exterior
+//     // if so, merge them into a single shape by deleting any shared sides
+//     // and recomputing the faces
+
+//     while let Some((a, b, a_indices, b_indices)) = find_adjacent_shapes(&faces) {
+//         println!("touching_shapes: {:?}", (a, b, a_indices, b_indices));
+//         let face_a = &faces[a];
+//         let face_b = &faces[b];
+
+//         match (&face_a.exterior, &face_b.exterior) {
+//             (Ring::Segments(segments_a), Ring::Segments(segments_b)) => {
+//                 let mut face_a_location = 0;
+//                 let mut face_b_location = 0;
+//                 let mut pulling_from_a = true;
+//                 let mut new_exterior_segments: Vec<Segment> = vec![];
+
+//                 loop {
+//                     if pulling_from_a {
+//                         let segment = segments_a[face_a_location].clone();
+//                         new_exterior_segments.push(segment);
+//                         face_a_location += 1;
+//                     } else {
+//                         // pull from b
+//                         let segment = segments_b[face_b_location].clone();
+//                         new_exterior_segments.push(segment);
+//                         face_b_location += 1;
+//                     }
+//                 }
+//             }
+//             _ => panic!("Only Rings made of Segments can have adjacent edges!"),
+//         }
+
+//         // let mut new_face = Face {
+//         //     exterior: new_exterior_segments,
+//         //     holes: vec![],
+//         // };
+
+//         // remove face a and face b
+//         // add new_face
+
+//         break;
+//     }
+
+//     // envelopment:
+//     // check if this shape's exterior is equal to any other shape's hole
+//     // if so, merge them into a single shape by deleting that hole from the
+//     // other shape, and adding this shape's holes to that shape's holes
+//     while let Some((a, b, c)) = find_enveloped_shapes(&faces) {
+//         // this means a's exterior is equal to one of b's holes. Hole c in particular
+//         let face_a = &faces[a];
+//         let face_b = &faces[b];
+
+//         // to fix this we need to remove the information contained in a's exterior completely.
+//         // to do that we remove the c indexed hole from face_b's list of holes
+//         let mut b_new_holes = face_b.holes.clone();
+//         b_new_holes.remove(c);
+//         b_new_holes.append(&mut face_a.holes.clone());
+
+//         let mut new_face_b = Face {
+//             exterior: face_b.exterior.clone(),
+//             holes: b_new_holes,
+//         };
+
+//         let mut new_faces = faces.clone();
+
+//         // replace the larger face with our modified face
+//         new_faces[b] = new_face_b.clone();
+
+//         // remove the smaller face from the list of faces
+//         new_faces.remove(a);
+//         faces = new_faces;
+//     }
+
+//     faces
+// }
+
+pub fn find_transit(
+    real_plane: &RealPlane,
+    start: &Point3,
+    end: &Point3,
+    center: &Point3,
+    clockwise: bool,
+) -> Point3 {
+    // let radius = start.distance_to(center);
+
+    let start = real_plane.plane.project(start);
+    let end = real_plane.plane.project(end);
+    let center = real_plane.plane.project(center);
+
+    let pts = arc_to_points(&start, &end, &center, clockwise);
+
+    let transit = &pts[pts.len() / 2];
+
+    let transit_3d = real_plane.plane.unproject(&transit);
+    transit_3d
+}
+
+pub fn fuse<C: ShapeOpsCurve<S> + std::fmt::Debug, S: ShapeOpsSurface + std::fmt::Debug>(
+    solid0: &TruckSolid<TruckPoint3, C, Surface>,
+    solid1: &TruckSolid<TruckPoint3, C, Surface>,
+) -> Option<TruckSolid<TruckPoint3, C, Surface>> {
+    println!("Okay let's fuse!");
+
+    let solid0_boundaries = solid0.boundaries();
+    let solid1_boundaries = solid1.boundaries();
+    assert!(solid0_boundaries.len() == 1);
+    assert!(solid1_boundaries.len() == 1);
+
+    let boundary0 = &solid0_boundaries[0];
+    let boundary1 = &solid1_boundaries[0];
+    let fusable_faces = find_coplanar_face_pairs(boundary0, boundary1, true);
+    assert!(fusable_faces.len() == 1);
+    let fusable_faces = fusable_faces[0];
+    // TODO: support the case where more than one is fusable
+    println!("fusable_faces: {:?}", fusable_faces);
+
+    let secondary_mergeable_faces = find_coplanar_face_pairs(boundary0, boundary1, false);
+    println!("secondary_mergeable_faces: {:?}", secondary_mergeable_faces);
+
+    // There's only one fused solid at the end. Create it by cloning solid0
+    // and then removing the fusable face from it.
+    let mut combined = boundary0.clone();
+    combined.remove(fusable_faces.0);
+
+    // Meanwhile, make a copy of solid1 and remove the fusable face from it too.
+    let mut boundary1_copy = boundary1.clone();
+    boundary1_copy.remove(fusable_faces.1);
+
+    // Then, add every face from solid1 to the combined solid.
+    combined.append(&mut boundary1_copy);
+
+    // Lastly, merge the two fusable faces together. This is complicated because
+    // one might be bigger than the other, or they might be the same size, or
+    // they might overlap somewhat. We'll need to figure out how to merge them.
+    // println!("How do I merge these two? {:?}", fusable_faces);
+    // println!("First:");
+    // for edge in boundary0[fusable_faces.0].edge_iter() {
+    //     println!(
+    //         "Edge: {:?} to {:?}",
+    //         edge.front().get_point(),
+    //         edge.back().get_point()
+    //     );
+    // }
+    let mut outer_face = boundary0[fusable_faces.0].clone();
+    let inner_face = boundary1[fusable_faces.1].clone();
+    outer_face.add_boundary(inner_face.boundaries().first().unwrap().clone());
+
+    // Then add that merged face to the solid and we've fused!
+    combined.push(outer_face);
+
+    // After that, we need to merge the secondary_mergeable_faces together.
+    for (face_0_idx, face_1_idx) in secondary_mergeable_faces {
+        let mut face_0 = boundary0[face_0_idx].clone();
+        let face_1 = boundary1[face_1_idx].clone();
+        face_0.add_boundary(face_1.boundaries().first().unwrap().clone());
+        combined.push(face_0);
+    }
+
+    // And then we're done!
+    // None
+    Some(TruckSolid::new(vec![combined]))
+}
+
+fn find_coplanar_face_pairs<C: ShapeOpsCurve<S>, S: ShapeOpsSurface>(
+    boundary0: &Shell<TruckPoint3, C, Surface>,
+    boundary1: &Shell<TruckPoint3, C, Surface>,
+    flip_second: bool,
+) -> Vec<(usize, usize)> {
+    let mut coplanar_faces: Vec<(usize, usize)> = vec![];
+    for (face_0_idx, face_0) in boundary0.face_iter().enumerate() {
+        let surface_0 = face_0.oriented_surface();
+
+        match surface_0 {
+            Surface::Plane(p0) => {
+                for (face_1_idx, face_1) in boundary1.face_iter().enumerate() {
+                    let mut surface_1 = face_1.oriented_surface();
+
+                    if flip_second {
+                        surface_1 = surface_1.inverse();
+                    }
+
+                    match surface_1 {
+                        Surface::Plane(p1) => {
+                            if are_coplanar(p0, p1) {
+                                coplanar_faces.push((face_0_idx, face_1_idx));
+                            }
+                        }
+                        _ => {}
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    coplanar_faces
+}
+
+fn are_coplanar(p0: Plane, p1: Plane) -> bool {
+    let normal0 = p0.normal();
+    let normal1 = p1.normal();
+
+    if !normal0.near(&normal1) {
+        return false;
+    }
+
+    let difference = p0.origin() - p1.origin();
+    let dot = normal0.dot(difference);
+    dot.abs() < 0.0001
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::project::tests::create_test_project;
+    use crate::project::Project;
+
+    #[allow(unused_imports)]
+    use super::*;
+
+    #[test]
+    fn create_project_solid() {
+        // Demonstrate creating a project and then realizing one solid
+        let p = create_test_project();
+
+        // now get solids? save as obj or stl or step?
+        let workbench = p.workbenches.get(0).unwrap();
+        let realization = workbench.realize(100);
+        let solids = realization.solids;
+        assert!(solids.len() == 1);
+    }
+
+    #[test]
+    fn project_from_files() {
+        let file_list = [
+            // this file contains three shapes which are adjacent to each other and
+            // thus should result in a single output solid
+            ("src/test_inputs/three_adjacent_faces.cadmium", 1),
+            // this file contains one square nested inside another
+            // and thus should result in a single output solid
+            ("src/test_inputs/nested_squares.cadmium", 1),
+            // this file contains one circle nested inside another
+            // and thus should result in a single output solid
+            ("src/test_inputs/nested_circles.cadmium", 1),
+            ("src/test_inputs/two_Es.cadmium", 1),
+            ("src/test_inputs/lots_of_nesting.cadmium", 4),
+        ];
+
+        for (file, expected_solids) in file_list.iter() {
+            let contents = std::fs::read_to_string(file).unwrap();
+
+            // deserialize the contents into a Project
+            let mut p: Project = serde_json::from_str(&contents).unwrap();
+
+            // get a realization
+            let workbench = p.workbenches.get_mut(0).unwrap();
+            let realization = workbench.realize(100);
+            let solids = realization.solids;
+            println!("[{}] solids: {:?}", file, solids.len());
+
+            assert_eq!(solids.len(), *expected_solids); // doesn't work yet!
+        }
+    }
+
+    #[test]
+    fn step_export() {
+        let p = create_test_project();
+        let workbench = &p.workbenches[0 as usize];
+        let realization = workbench.realize(1000);
+        let keys = Vec::from_iter(realization.solids.keys());
+
+        realization.save_solid_as_step_file(keys[0], "pkg/test.step");
+        realization.save_solid_as_obj_file(keys[0], "pkg/test.obj", 0.001);
+    }
+}
diff --git a/packages/cadmium/src/feature/extrusion.rs b/packages/cadmium/src/feature/extrusion.rs
deleted file mode 100644
index 5b994b51..00000000
--- a/packages/cadmium/src/feature/extrusion.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use serde::{Deserialize, Serialize};
-use truck_modeling::builder;
-use tsify_next::Tsify;
-
-use super::prelude::*;
-
-use crate::archetypes::Vector3;
-use crate::isketch::face::{FaceSelector, Selector};
-use crate::isketch::ISketch;
-use crate::message::{Identifiable, MessageHandler};
-use crate::step::{StepHash, StepResult};
-use crate::workbench::Workbench;
-use crate::IDType;
-
-use super::get_isoface_wires;
-use super::{Feature, SolidLike};
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub enum Mode {
-    New,
-    Add(Vec<IDType>),
-    Remove(Vec<IDType>),
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub enum Direction {
-    Normal,
-    NegativeNormal,
-    Specified(Vector3),
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Extrusion {
-    pub faces: Selector,
-    pub sketch: Rc<RefCell<ISketch>>,
-    pub length: f64,
-    pub offset: f64,
-    pub direction: Direction,
-    pub mode: Mode,
-}
-
-impl Extrusion {
-    pub fn new(
-        faces: Vec<IDType>,
-        sketch: Rc<RefCell<ISketch>>,
-        length: f64,
-        offset: f64,
-        direction: Direction,
-        mode: Mode,
-    ) -> Self {
-        Extrusion {
-            faces: Selector::from_face_ids(&sketch.clone().borrow(), faces),
-            sketch,
-            length,
-            offset,
-            direction,
-            mode,
-        }
-    }
-}
-
-impl SolidLike for Extrusion {
-    fn references(&self) -> Vec<Rc<RefCell<Feature>>> {
-        // self.faces.iter().map(|f| FeatureCell::Face(f.clone())).collect()
-        todo!("Extrusion::references")
-    }
-
-    fn to_feature(&self) -> Feature {
-        Feature::Extrusion(self.clone())
-    }
-
-    fn get_truck_solids(&self) -> anyhow::Result<Vec<TruckClosedSolid>> {
-        let sketch = self.sketch.borrow();
-        let plane = sketch.plane.borrow().clone();
-
-        let extrusion_direction = match &self.direction {
-            Direction::Normal => plane.tertiary.clone(),
-            Direction::NegativeNormal => plane.tertiary.times(-1.0),
-            Direction::Specified(vector) => vector.clone(),
-        };
-
-        let extrusion_vector = extrusion_direction.times(self.length - self.offset);
-        let offset_vector = extrusion_direction.times(self.offset);
-        let extrusion_tvector =
-            TruckVector3::new(extrusion_vector.x, extrusion_vector.y, extrusion_vector.z);
-        let offset_tvector = TruckVector3::new(offset_vector.x, offset_vector.y, offset_vector.z);
-
-        Ok(self
-            .faces
-            .get_selected_faces(&sketch)
-            .iter()
-            .map(|f| {
-                let wires = get_isoface_wires(self.sketch.clone(), &f).unwrap();
-                let face = builder::try_attach_plane(&wires).unwrap();
-
-                // Can we calculate ALL the wires at once and not iter-sweep?
-                let sweep = builder::tsweep(&face, extrusion_tvector);
-
-                builder::translated(&sweep, offset_tvector)
-            })
-            .collect())
-    }
-}
-
-impl<'a> TryFrom<&'a mut Feature> for &'a mut Extrusion {
-    type Error = anyhow::Error;
-
-    // The Feature enum has only 1 variant for now but that will change soon
-    #[allow(irrefutable_let_patterns)]
-    fn try_from(value: &'a mut Feature) -> Result<Self, Self::Error> {
-        let Feature::Extrusion(ref mut extrusion) = value else {
-            return Err(anyhow::anyhow!("Failed to convert Feature to Extrusion"));
-        };
-
-        Ok(extrusion)
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct Add {
-    pub sketch_id: StepHash,
-    pub faces: Vec<IDType>,
-    pub length: f64,
-    pub offset: f64,
-    pub direction: Direction,
-    pub mode: Mode,
-}
-
-impl MessageHandler for Add {
-    // Parent to workbench to add to solids and be able to reference the sketch
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        workbench_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let sketch = <Rc<RefCell<ISketch>>>::from_parent_id(&workbench_ref, self.sketch_id)?;
-        let mut workbench = workbench_ref.borrow_mut();
-
-        let extrusion = Extrusion::new(
-            self.faces.clone(),
-            sketch.clone(),
-            self.length,
-            self.offset,
-            self.direction.clone(),
-            self.mode.clone(),
-        );
-        let extrusion_cell = Rc::new(RefCell::new(extrusion.to_feature()));
-
-        let id = workbench.features_next_id;
-        workbench.features.insert(id, extrusion_cell);
-        workbench.features_next_id += 1;
-        let id = workbench.features_next_id - 1;
-
-        Ok(Some((
-            id,
-            StepResult::Solid {
-                solids: extrusion.to_solids()?,
-            },
-        )))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::project::tests::create_test_project;
-    use crate::project::Project;
-
-    #[test]
-    #[ignore = "uses old filetype"]
-    fn project_from_files() {
-        let file_list = [
-            // this file contains three shapes which are adjacent to each other and
-            // thus should result in a single output solid
-            ("src/test_inputs/three_adjacent_faces.cadmium", 1),
-            // this file contains one square nested inside another
-            // and thus should result in a single output solid
-            ("src/test_inputs/nested_squares.cadmium", 1),
-            // this file contains one circle nested inside another
-            // and thus should result in a single output solid
-            ("src/test_inputs/nested_circles.cadmium", 1),
-            ("src/test_inputs/two_Es.cadmium", 1),
-            ("src/test_inputs/lots_of_nesting.cadmium", 4),
-        ];
-
-        for (file, expected_solids) in file_list.iter() {
-            let contents = std::fs::read_to_string(file).unwrap();
-
-            // deserialize the contents into a Project
-            let p: Project = serde_json::from_str(&contents).unwrap();
-
-            // get a realization
-            let workbench_ref = p.get_workbench_by_id(0).unwrap();
-            let workbench = workbench_ref.borrow();
-            let solids = &workbench.features;
-            println!("[{}] solids: {:?}", file, solids.len());
-
-            assert_eq!(solids.len(), *expected_solids); // doesn't work yet!
-        }
-    }
-
-    #[test]
-    fn step_export() {
-        let p = create_test_project();
-        let workbench_ref = p.get_workbench_by_id(0).unwrap();
-        let workbench = workbench_ref.borrow();
-        let feature = workbench.features.get(&0).unwrap().borrow();
-        let solid = &feature.as_solid_like().to_solids().unwrap()[0];
-
-        solid.save_as_step("pkg/test.step");
-        solid.save_as_obj("pkg/test.obj", 0.001);
-    }
-}
diff --git a/packages/cadmium/src/feature/helpers.rs b/packages/cadmium/src/feature/helpers.rs
deleted file mode 100644
index 022548ac..00000000
--- a/packages/cadmium/src/feature/helpers.rs
+++ /dev/null
@@ -1,215 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use geo::LineString;
-use isotope::decompose::face::Face;
-
-use log::debug;
-use truck_modeling::{builder, Edge, Vertex, Wire};
-use truck_polymesh::InnerSpace;
-use truck_polymesh::Invertible;
-use truck_polymesh::Tolerance;
-use truck_shapeops::{ShapeOpsCurve, ShapeOpsSurface};
-use truck_topology::Shell;
-
-use super::prelude::*;
-use crate::isketch::ISketch;
-
-pub fn geopoint_to_truckpoint(
-    point: geo::Point<f64>,
-    sketch: Rc<RefCell<ISketch>>,
-) -> Result<TruckPoint3, anyhow::Error> {
-    let sketch_ref = sketch.borrow();
-    let sketch_point = sketch_ref
-        .find_point_ref(point.x(), point.y())
-        .ok_or(anyhow::anyhow!("geo::Point not found in sketch"))?;
-    let point_3d = sketch_ref.get_point_3d(sketch_point)?.1;
-    Ok(point_3d.into())
-}
-
-pub fn linestring_to_wire(
-    line: &LineString,
-    sketch: Rc<RefCell<ISketch>>,
-) -> Result<Wire, anyhow::Error> {
-    let mut vertices: Vec<Vertex> = Vec::new();
-    for point in line.points() {
-        let vertex = builder::vertex(geopoint_to_truckpoint(point, sketch.clone())?);
-        vertices.push(vertex);
-    }
-
-    let mut edges: Vec<Edge> = Vec::new();
-    for i in 0..vertices.len() - 2 {
-        let edge = builder::line(&vertices[i], &vertices[i + 1]);
-        edges.push(edge);
-    }
-
-    // Close the loop by connecting the last vertex to the first
-    let last_edge = builder::line(&vertices[vertices.len() - 2], &vertices[0]);
-    edges.push(last_edge);
-
-    Ok(Wire::from_iter(edges))
-}
-
-// It assumes that the feature will start from the same plane as the sketch
-// To change this, geopoint_to_truckpoint should be modified to accept a plane
-// and calculate the 3d point from that plane on-demand
-pub fn get_isoface_wires(
-    sketch: Rc<RefCell<ISketch>>,
-    face: &ISOFace,
-) -> Result<Vec<Wire>, anyhow::Error> {
-    let polygon = face.as_polygon();
-    let exterior = linestring_to_wire(polygon.exterior(), sketch.clone())?;
-    let mut interiors = polygon
-        .interiors()
-        .iter()
-        .map(|line| linestring_to_wire(line, sketch.clone()))
-        .collect::<Result<Vec<_>, anyhow::Error>>()?;
-    interiors.insert(0, exterior);
-
-    Ok(interiors)
-}
-
-pub fn find_enveloped_shapes(faces: &[Face]) -> Vec<(usize, usize)> {
-    let mut retval = vec![];
-    for (a, face_a) in faces.iter().enumerate() {
-        for (b, face_b) in faces.iter().enumerate() {
-            if a == b {
-                continue;
-            }
-
-            // check if b's exterior is equal to any of a's holes
-            for hole in face_a.holes.iter() {
-                if hole == face_b {
-                    retval.push((b, a)); // (small, big)
-                }
-            }
-        }
-    }
-
-    retval
-}
-
-pub fn find_adjacent_shapes(faces: &[Face]) -> Option<(usize, usize, Vec<usize>, Vec<usize>)> {
-    for (a, face_a) in faces.iter().enumerate() {
-        for (b, face_b) in faces.iter().enumerate() {
-            if a >= b {
-                continue;
-            }
-
-            let adjacent_edges = face_a.exterior.adjacent_edges(&face_b.exterior);
-
-            match adjacent_edges {
-                None => continue,
-                Some(matched_edges) => return Some((a, b, matched_edges.0, matched_edges.1)),
-            }
-        }
-    }
-
-    None
-}
-
-pub fn fuse<C: ShapeOpsCurve<S> + std::fmt::Debug, S: ShapeOpsSurface + std::fmt::Debug>(
-    solid0: &TruckTopoSolid<TruckPoint3, C, TruckSurface>,
-    solid1: &TruckTopoSolid<TruckPoint3, C, TruckSurface>,
-) -> Option<TruckTopoSolid<TruckPoint3, C, TruckSurface>> {
-    let solid0_boundaries = solid0.boundaries();
-    let solid1_boundaries = solid1.boundaries();
-    assert!(solid0_boundaries.len() == 1);
-    assert!(solid1_boundaries.len() == 1);
-
-    let boundary0 = &solid0_boundaries[0];
-    let boundary1 = &solid1_boundaries[0];
-    let fusable_faces = find_coplanar_face_pairs(boundary0, boundary1, true);
-    assert!(fusable_faces.len() == 1);
-    let fusable_faces = fusable_faces[0];
-    // TODO: support the case where more than one is fusable
-    debug!("fusable_faces: {:?}", fusable_faces);
-
-    let secondary_mergeable_faces = find_coplanar_face_pairs(boundary0, boundary1, false);
-    debug!("secondary_mergeable_faces: {:?}", secondary_mergeable_faces);
-
-    // There's only one fused solid at the end. Create it by cloning solid0
-    // and then removing the fusable face from it.
-    let mut combined = boundary0.clone();
-    combined.remove(fusable_faces.0);
-
-    // Meanwhile, make a copy of solid1 and remove the fusable face from it too.
-    let mut boundary1_copy = boundary1.clone();
-    boundary1_copy.remove(fusable_faces.1);
-
-    // Then, add every face from solid1 to the combined solid.
-    combined.append(&mut boundary1_copy);
-
-    // Lastly, merge the two fusable faces together. This is complicated because
-    // one might be bigger than the other, or they might be the same size, or
-    // they might overlap somewhat. We'll need to figure out how to merge them.
-    // println!("How do I merge these two? {:?}", fusable_faces);
-    // println!("First:");
-    // for edge in boundary0[fusable_faces.0].edge_iter() {
-    //     println!(
-    //         "Edge: {:?} to {:?}",
-    //         edge.front().get_point(),
-    //         edge.back().get_point()
-    //     );
-    // }
-    let mut outer_face = boundary0[fusable_faces.0].clone();
-    let inner_face = boundary1[fusable_faces.1].clone();
-    outer_face.add_boundary(inner_face.boundaries().first().unwrap().clone());
-
-    // Then add that merged face to the solid and we've fused!
-    combined.push(outer_face);
-
-    // After that, we need to merge the secondary_mergeable_faces together.
-    for (face_0_idx, face_1_idx) in secondary_mergeable_faces {
-        let mut face_0 = boundary0[face_0_idx].clone();
-        let face_1 = boundary1[face_1_idx].clone();
-        face_0.add_boundary(face_1.boundaries().first().unwrap().clone());
-        combined.push(face_0);
-    }
-
-    // And then we're done!
-    // None
-    Some(TruckTopoSolid::new(vec![combined]))
-}
-
-fn find_coplanar_face_pairs<C: ShapeOpsCurve<S>, S: ShapeOpsSurface>(
-    boundary0: &Shell<TruckPoint3, C, TruckSurface>,
-    boundary1: &Shell<TruckPoint3, C, TruckSurface>,
-    flip_second: bool,
-) -> Vec<(usize, usize)> {
-    let mut coplanar_faces: Vec<(usize, usize)> = vec![];
-    for (face_0_idx, face_0) in boundary0.face_iter().enumerate() {
-        let surface_0 = face_0.oriented_surface();
-
-        if let TruckSurface::Plane(p0) = surface_0 {
-            for (face_1_idx, face_1) in boundary1.face_iter().enumerate() {
-                let mut surface_1 = face_1.oriented_surface();
-
-                if flip_second {
-                    surface_1 = surface_1.inverse();
-                }
-
-                if let TruckSurface::Plane(p1) = surface_1 {
-                    if are_coplanar(p0, p1) {
-                        coplanar_faces.push((face_0_idx, face_1_idx));
-                    }
-                }
-            }
-        }
-    }
-
-    coplanar_faces
-}
-
-fn are_coplanar(p0: TruckPlane, p1: TruckPlane) -> bool {
-    let normal0 = p0.normal();
-    let normal1 = p1.normal();
-
-    if !normal0.near(&normal1) {
-        return false;
-    }
-
-    let difference = p0.origin() - p1.origin();
-    let dot = normal0.dot(difference);
-    dot.abs() < 0.0001
-}
diff --git a/packages/cadmium/src/feature/mod.rs b/packages/cadmium/src/feature/mod.rs
deleted file mode 100644
index d6cc3379..00000000
--- a/packages/cadmium/src/feature/mod.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::cell::RefCell;
-use std::fmt::Debug;
-use std::rc::Rc;
-
-use serde::Deserialize;
-use serde::Serialize;
-use tsify_next::Tsify;
-
-pub mod extrusion;
-pub mod helpers;
-pub mod point;
-pub mod prelude;
-pub mod solid;
-
-use prelude::*;
-
-pub trait SolidLike: Debug {
-    fn references(&self) -> Vec<Rc<RefCell<Feature>>>;
-    fn get_truck_solids(&self) -> anyhow::Result<Vec<TruckClosedSolid>>;
-    fn to_feature(&self) -> Feature;
-
-    fn to_solids(&self) -> anyhow::Result<Vec<Solid>> {
-        let truck_solids = self.get_truck_solids()?;
-
-        Ok(truck_solids
-            .iter()
-            .map(|truck_solid| Solid::from_truck_solid("".to_owned(), truck_solid.clone()))
-            .collect())
-    }
-}
-
-#[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[non_exhaustive]
-pub enum Feature {
-    Extrusion(extrusion::Extrusion),
-}
-
-impl Feature {
-    pub fn as_solid_like(&self) -> &dyn SolidLike {
-        match self {
-            Feature::Extrusion(extrusion) => extrusion,
-        }
-    }
-}
diff --git a/packages/cadmium/src/feature/point.rs b/packages/cadmium/src/feature/point.rs
deleted file mode 100644
index d45a418f..00000000
--- a/packages/cadmium/src/feature/point.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-use std::cell::RefCell;
-use std::ops::{Add, Sub};
-use std::rc::Rc;
-
-use isotope::primitives::point2::Point2 as ISOPoint2;
-use serde::{Deserialize, Serialize};
-use truck_polymesh::Point3 as PolyTruckPoint3;
-use tsify_next::Tsify;
-
-use crate::archetypes::{Plane, Vector3};
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Point3 {
-    pub x: f64,
-    pub y: f64,
-    pub z: f64,
-    pub hidden: bool,
-}
-
-impl Point3 {
-    pub fn new(x: f64, y: f64, z: f64) -> Self {
-        Point3 {
-            x,
-            y,
-            z,
-            hidden: false,
-        }
-    }
-
-    pub fn plus(&self, v: Vector3) -> Vector3 {
-        Vector3 {
-            x: self.x + v.x,
-            y: self.y + v.y,
-            z: self.z + v.z,
-        }
-    }
-
-    pub fn minus(&self, other: &Point3) -> Vector3 {
-        Vector3 {
-            x: self.x - other.x,
-            y: self.y - other.y,
-            z: self.z - other.z,
-        }
-    }
-
-    pub fn distance_to(&self, other: &Point3) -> f64 {
-        let dx = self.x - other.x;
-        let dy = self.y - other.y;
-        let dz = self.z - other.z;
-        (dx * dx + dy * dy + dz * dz).sqrt()
-    }
-
-    pub fn from_plane_point(plane: &Plane, point: &ISOPoint2) -> Point3 {
-        let o = plane.origin.clone();
-        let x = plane.primary.clone();
-        let y = plane.secondary.clone();
-
-        let pt3 = o.plus(x.times(point.x())).plus(y.times(point.y()));
-        Point3::new(pt3.x, pt3.y, pt3.z)
-    }
-}
-
-impl From<Point3> for PolyTruckPoint3 {
-    fn from(val: Point3) -> Self {
-        PolyTruckPoint3 {
-            x: val.x,
-            y: val.y,
-            z: val.z,
-        }
-    }
-}
-
-impl Add for Point3 {
-    type Output = Point3;
-
-    fn add(self, other: Point3) -> Point3 {
-        Point3 {
-            x: self.x + other.x,
-            y: self.y + other.y,
-            z: self.z + other.z,
-            hidden: false,
-        }
-    }
-}
-
-impl Sub for Point3 {
-    type Output = Point3;
-
-    fn sub(self, other: Point3) -> Point3 {
-        Point3 {
-            x: self.x - other.x,
-            y: self.y - other.y,
-            z: self.z - other.z,
-            hidden: false,
-        }
-    }
-}
-
-impl PartialEq for Point3 {
-    fn eq(&self, other: &Self) -> bool {
-        self.x == other.x && self.y == other.y && self.z == other.z
-    }
-}
-
-use crate::message::{Identifiable, MessageHandler};
-use crate::step::{StepHash, StepResult};
-use crate::workbench::Workbench;
-use crate::IDType;
-
-impl Identifiable for Rc<RefCell<Point3>> {
-    type Parent = Rc<RefCell<Workbench>>;
-    const ID_NAME: &'static str = "point_id";
-
-    fn from_parent_id(parent: &Self::Parent, hash: StepHash) -> anyhow::Result<Self> {
-        let step = parent
-            .borrow()
-            .get_step_by_hash(hash)
-            .ok_or(anyhow::anyhow!(
-                "No step with hash {} exists in the current workbench",
-                hash
-            ))?
-            .clone();
-
-        let StepResult::Point(point) = step.borrow().result.clone() else {
-            return Err(anyhow::anyhow!(
-                "The step with hash {} is not a point",
-                hash
-            ));
-        };
-
-        Ok(point)
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct WorkbenchPointUpdate {
-    x: f64,
-    y: f64,
-    z: f64,
-}
-
-impl MessageHandler for WorkbenchPointUpdate {
-    type Parent = Rc<RefCell<Point3>>;
-    fn handle_message(
-        &self,
-        point_ref: Rc<RefCell<Point3>>,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut point = point_ref.borrow_mut();
-        point.x = self.x;
-        point.y = self.y;
-        point.z = self.z;
-        Ok(None)
-    }
-}
diff --git a/packages/cadmium/src/feature/prelude.rs b/packages/cadmium/src/feature/prelude.rs
deleted file mode 100644
index d0cd17ad..00000000
--- a/packages/cadmium/src/feature/prelude.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-pub use super::helpers::*;
-pub use super::solid::Solid;
-
-pub const MESH_TOLERANCE: f64 = 0.1;
-
-pub use isotope::decompose::face::Face as ISOFace;
-
-pub use truck_modeling::Face as TruckFace;
-pub use truck_modeling::Line as TruckLine;
-pub use truck_modeling::Plane as TruckPlane;
-pub use truck_modeling::Point1 as TruckPoint1;
-pub use truck_modeling::Point2 as TruckPoint2;
-pub use truck_modeling::Point3 as TruckPoint3;
-pub use truck_modeling::Solid as TruckSolid;
-pub use truck_modeling::Surface as TruckSurface;
-pub use truck_modeling::Vector1 as TruckVector1;
-pub use truck_modeling::Vector2 as TruckVector2;
-pub use truck_modeling::Vector3 as TruckVector3;
-pub use truck_modeling::Vertex as TruckVertex;
-
-pub use truck_topology::Solid as TruckTopoSolid;
-
-pub type TruckClosedSolid =
-    TruckTopoSolid<truck_modeling::Point3, truck_modeling::Curve, truck_modeling::Surface>;
diff --git a/packages/cadmium/src/feature/solid.rs b/packages/cadmium/src/feature/solid.rs
deleted file mode 100644
index cd13e51f..00000000
--- a/packages/cadmium/src/feature/solid.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-use std::fmt::Debug;
-
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-use wasm_bindgen::prelude::*;
-
-use truck_meshalgo::prelude::OptimizingFilter;
-use truck_meshalgo::tessellation::MeshableShape;
-use truck_meshalgo::tessellation::MeshedShape;
-use truck_polymesh::obj;
-use truck_stepio::out;
-
-use crate::archetypes::Vector2;
-use crate::archetypes::Vector3;
-
-use super::prelude::*;
-
-#[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[repr(transparent)]
-pub struct SolidArray(pub Vec<Solid>);
-
-#[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Solid {
-    pub name: String,
-    pub crc32: String,
-    pub vertices: Vec<Vector3>,
-    pub normals: Vec<Vector3>,
-    pub uvs: Vec<Vector2>,
-    pub indices: Vec<usize>,
-    pub triangles: Vec<Vec<u64>>,
-    pub truck_solid: TruckClosedSolid,
-}
-
-impl Solid {
-    pub fn from_truck_solid(name: String, truck_solid: TruckClosedSolid) -> Self {
-        let mut solid = Solid {
-            name,
-            crc32: "".to_owned(),
-            vertices: vec![],
-            normals: vec![],
-            triangles: vec![],
-            uvs: vec![],
-            indices: vec![],
-            truck_solid,
-        };
-        let mut mesh = solid.truck_solid.triangulation(MESH_TOLERANCE).to_polygon();
-        mesh.put_together_same_attrs(MESH_TOLERANCE);
-
-        // the mesh is prepared for obj export, but we need to convert it
-        // to a format compatible for rendering
-        // We have to brute force this. Go through every single triangle
-        // and emit three positions, three normals, and three uvs.
-        let mut index = 0_usize;
-        for face in mesh.tri_faces() {
-            for v in face.iter() {
-                let vertex_index = v.pos;
-                let normal_index = v.nor.unwrap();
-                let uv_index = v.uv.unwrap();
-                let vertex = mesh.positions()[vertex_index];
-                let normal = mesh.normals()[normal_index];
-                let uv = mesh.uv_coords()[uv_index];
-
-                let pt = Vector3::new(vertex.x, vertex.y, vertex.z);
-                solid.vertices.push(pt);
-                solid
-                    .normals
-                    .push(Vector3::new(normal.x, normal.y, normal.z));
-                solid.uvs.push(Vector2::new(uv.x, uv.y));
-                solid.indices.push(index);
-
-                index += 1;
-            }
-        }
-
-        // compute the crc32 of the vertices
-        let mut hasher = crc32fast::Hasher::new();
-        for vertex in solid.vertices.iter() {
-            hasher.update(&vertex.x.to_be_bytes());
-            hasher.update(&vertex.y.to_be_bytes());
-            hasher.update(&vertex.z.to_be_bytes());
-        }
-        solid.crc32 = format!("{:x}", hasher.finalize());
-
-        solid
-    }
-
-    pub fn get_face_by_normal(&self, normal: &Vector3) -> Option<TruckFace> {
-        let truck_solid = &self.truck_solid;
-        let boundaries = &truck_solid.boundaries()[0];
-
-        let mut candidate_faces: Vec<TruckFace> = vec![];
-
-        boundaries.face_iter().for_each(|face| {
-            let oriented_surface = face.oriented_surface();
-
-            if let truck_modeling::geometry::Surface::Plane(p) = oriented_surface {
-                let this_face_normal = p.normal();
-
-                if (normal.x - this_face_normal.x).abs() < 0.0001
-                    && (normal.y - this_face_normal.y).abs() < 0.0001
-                    && (normal.z - this_face_normal.z).abs() < 0.0001
-                {
-                    candidate_faces.push(face.clone());
-                }
-            }
-        });
-
-        match candidate_faces.len() {
-            0 => None,
-            1 => Some(candidate_faces[0].clone()),
-            _ => panic!("More than one face with the same normal!"),
-        }
-    }
-
-    pub fn to_obj_string(&self, tolerance: f64) -> String {
-        let mut mesh = self.truck_solid.triangulation(tolerance).to_polygon();
-        mesh.put_together_same_attrs(MESH_TOLERANCE);
-        let mut buf = Vec::new();
-        obj::write(&mesh, &mut buf).unwrap();
-
-        String::from_utf8(buf).unwrap()
-    }
-
-    pub fn save_as_obj(&self, filename: &str, tolerance: f64) {
-        let mut mesh = self.truck_solid.triangulation(tolerance).to_polygon();
-        mesh.put_together_same_attrs(MESH_TOLERANCE);
-        let file = std::fs::File::create(filename).unwrap();
-        obj::write(&mesh, file).unwrap();
-    }
-
-    pub fn to_step_string(&self) -> String {
-        let compressed = self.truck_solid.compress();
-
-        out::CompleteStepDisplay::new(
-            out::StepModel::from(&compressed),
-            out::StepHeaderDescriptor {
-                organization_system: "cadmium-shape-to-step".to_owned(),
-                ..Default::default()
-            },
-        )
-        .to_string()
-    }
-
-    pub fn save_as_step(&self, filename: &str) {
-        let step_text = self.to_step_string();
-        let mut step_file = std::fs::File::create(filename).unwrap();
-        std::io::Write::write_all(&mut step_file, step_text.as_ref()).unwrap();
-    }
-}
diff --git a/packages/cadmium/src/isketch/compound.rs b/packages/cadmium/src/isketch/compound.rs
deleted file mode 100644
index dfe021a8..00000000
--- a/packages/cadmium/src/isketch/compound.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::fmt::Debug;
-
-use isotope::primitives::PrimitiveCell;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use super::compound_rectangle;
-
-pub trait CompoundLike: Debug {
-    fn references(&self) -> Vec<PrimitiveCell>;
-    fn created_references(&self) -> Vec<PrimitiveCell>;
-    fn populate_created_references(
-        &self,
-        sketch: &mut isotope::sketch::Sketch,
-    ) -> anyhow::Result<()> {
-        for reference in self.created_references() {
-            sketch.add_primitive(reference)?;
-        }
-        Ok(())
-    }
-}
-
-#[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[non_exhaustive]
-pub enum Compound {
-    Rectangle(compound_rectangle::Rectangle),
-}
-
-impl Compound {
-    pub fn as_compound_like(&self) -> &dyn CompoundLike {
-        match self {
-            Compound::Rectangle(rectangle) => rectangle,
-        }
-    }
-}
diff --git a/packages/cadmium/src/isketch/compound_rectangle.rs b/packages/cadmium/src/isketch/compound_rectangle.rs
deleted file mode 100644
index 39c2e7e1..00000000
--- a/packages/cadmium/src/isketch/compound_rectangle.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use isotope::primitives::line::Line;
-use isotope::primitives::point2::Point2;
-use isotope::primitives::PrimitiveCell;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::message::MessageHandler;
-use crate::step::sketch_action::IntoSketchActionResult;
-use crate::step::StepResult;
-use crate::IDType;
-
-use super::compound::{Compound, CompoundLike};
-use super::ISketch;
-
-#[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct Rectangle {
-    start: Rc<RefCell<Point2>>,
-    end: Rc<RefCell<Point2>>,
-    new_points: [Rc<RefCell<Point2>>; 2],
-    new_lines: [Rc<RefCell<Line>>; 4],
-}
-
-impl Rectangle {
-    pub fn new(start: Rc<RefCell<Point2>>, end: Rc<RefCell<Point2>>) -> Self {
-        let start_point = start.borrow().clone();
-        let end_point = end.borrow().clone();
-
-        let other_start = Rc::new(RefCell::new(Point2::new(start_point.x(), end_point.y())));
-        let other_end = Rc::new(RefCell::new(Point2::new(end_point.x(), start_point.y())));
-
-        let new_lines = [
-            Rc::new(RefCell::new(Line::new(start.clone(), other_start.clone()))),
-            Rc::new(RefCell::new(Line::new(other_start.clone(), end.clone()))),
-            Rc::new(RefCell::new(Line::new(end.clone(), other_end.clone()))),
-            Rc::new(RefCell::new(Line::new(other_end.clone(), start.clone()))),
-        ];
-        Self {
-            start,
-            end,
-            new_points: [other_start, other_end],
-            new_lines,
-        }
-    }
-}
-
-impl CompoundLike for Rectangle {
-    fn references(&self) -> Vec<PrimitiveCell> {
-        vec![
-            PrimitiveCell::Point2(self.start.clone()),
-            PrimitiveCell::Point2(self.end.clone()),
-        ]
-    }
-
-    fn created_references(&self) -> Vec<PrimitiveCell> {
-        vec![
-            PrimitiveCell::Point2(self.new_points[0].clone()),
-            PrimitiveCell::Point2(self.new_points[1].clone()),
-            PrimitiveCell::Line(self.new_lines[0].clone()),
-            PrimitiveCell::Line(self.new_lines[1].clone()),
-            PrimitiveCell::Line(self.new_lines[2].clone()),
-            PrimitiveCell::Line(self.new_lines[3].clone()),
-        ]
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct Add {
-    pub start: IDType,
-    pub end: IDType,
-}
-
-impl MessageHandler for Add {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Rc<RefCell<ISketch>>,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut isketch = sketch_ref.borrow_mut();
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let start_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(self.start).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("Start point is not a point"));
-            };
-        let end_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(self.end).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("End point is not a point"));
-            };
-
-        let rectangle = Rectangle::new(start_point.clone(), end_point.clone());
-        rectangle.populate_created_references(&mut sketch)?;
-        drop(sketch);
-
-        let compound = Rc::new(RefCell::new(Compound::Rectangle(rectangle)));
-        let rectangle_id = isketch.compounds_next_id;
-        isketch.compounds.insert(rectangle_id, compound.clone());
-        isketch.compounds_next_id += 1;
-
-        Ok(Some((rectangle_id, compound.into_result(&isketch))))
-    }
-}
diff --git a/packages/cadmium/src/isketch/face.rs b/packages/cadmium/src/isketch/face.rs
deleted file mode 100644
index cbb393aa..00000000
--- a/packages/cadmium/src/isketch/face.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use geo::{Centroid, EuclideanDistance as _};
-use isotope::primitives::point2::Point2;
-use itertools::Itertools;
-use serde::{Deserialize, Serialize};
-
-pub use isotope::decompose::face::Face;
-
-use crate::IDType;
-
-use super::ISketch;
-
-// Configuration of which selector to use
-// As soon as we land on a single selector, this trait should no longer be required
-// it's mainly used for the bench-faceselector-report
-pub type Selector = IDSelector;
-
-pub trait FaceSelector {
-    fn get_selected_faces(&self, isketch: &ISketch) -> Vec<Face>;
-    fn from_face_ids(sketch: &ISketch, ids: Vec<IDType>) -> Self;
-}
-
-/// The most simple selector, just select faces by their ID
-/// If the number or order of faces change for any reason, this selector will break
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct IDSelector {
-    pub ids: Vec<IDType>,
-}
-
-impl FaceSelector for IDSelector {
-    fn get_selected_faces(&self, sketch: &ISketch) -> Vec<Face> {
-        sketch.get_face_ids(self.ids.clone())
-    }
-
-    fn from_face_ids(_sketch: &ISketch, ids: Vec<IDType>) -> Self {
-        Self { ids }
-    }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct CentroidSelector {
-    pub centroids: Vec<Point2>,
-}
-
-impl CentroidSelector {
-    pub fn get_face_centroid(&self, face: &Face) -> Point2 {
-        let centroid = face.as_polygon().centroid().unwrap();
-        Point2::new(centroid.x(), centroid.y())
-    }
-}
-
-impl FaceSelector for CentroidSelector {
-    fn get_selected_faces(&self, sketch: &ISketch) -> Vec<Face> {
-        self.centroids
-            .iter()
-            .filter_map(|c| {
-                let point = geo::Point::new(c.x(), c.y());
-                let faces = sketch.faces();
-                let min = faces.iter().min_by(|a, b| {
-                    let Some(a_centroid) = &a.as_polygon().centroid() else {
-                        return std::cmp::Ordering::Greater;
-                    };
-                    let Some(b_centroid) = &b.as_polygon().centroid() else {
-                        return std::cmp::Ordering::Greater;
-                    };
-                    let a_distance = a_centroid.euclidean_distance(&point);
-                    let b_distance = b_centroid.euclidean_distance(&point);
-                    a_distance.partial_cmp(&b_distance).unwrap()
-                });
-
-                min.cloned()
-            })
-            .collect_vec()
-    }
-
-    fn from_face_ids(sketch: &ISketch, ids: Vec<IDType>) -> Self {
-        Self {
-            centroids: sketch
-                .get_face_ids(ids)
-                .iter()
-                .filter_map(|f| {
-                    // We're straight-up skipping faces without a centroid
-                    if let Some(centroid) = f.as_polygon().centroid() {
-                        Some(Point2::new(centroid.x(), centroid.y()))
-                    } else {
-                        None
-                    }
-                })
-                .collect(),
-        }
-    }
-}
diff --git a/packages/cadmium/src/isketch/mod.rs b/packages/cadmium/src/isketch/mod.rs
deleted file mode 100644
index 962af7f9..00000000
--- a/packages/cadmium/src/isketch/mod.rs
+++ /dev/null
@@ -1,169 +0,0 @@
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::rc::Rc;
-
-use isotope::decompose::face::Face;
-use isotope::primitives::point2::Point2 as ISOPoint2;
-use isotope::primitives::PrimitiveCell;
-use isotope::sketch::Sketch;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::archetypes::{Plane, PlaneDescription};
-use crate::error::CADmiumError;
-use crate::feature::point::Point3;
-use crate::message::Identifiable;
-use crate::step::{StepHash, StepResult};
-use crate::workbench::Workbench;
-use crate::IDType;
-
-pub mod compound;
-pub mod compound_rectangle;
-pub mod face;
-pub mod primitive;
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct ISketch {
-    // TODO: Make it private with a setter
-    pub plane: Rc<RefCell<Plane>>,
-
-    sketch: Rc<RefCell<Sketch>>,
-    primitive_map: BTreeMap<StepHash, IDType>,
-    compounds: BTreeMap<u64, Rc<RefCell<compound::Compound>>>,
-    compounds_next_id: u64,
-    points_3d: BTreeMap<u64, Point3>,
-}
-
-impl ISketch {
-    pub fn new(plane: Rc<RefCell<Plane>>) -> Self {
-        // The key difference between Sketch and RealSketch is that Sketch lives
-        // in 2D and RealSketch lives in 3D. So we need to convert the points
-
-        let mut real_sketch = Self {
-            plane: plane.clone(),
-            points_3d: BTreeMap::new(),
-            primitive_map: BTreeMap::new(),
-            compounds: BTreeMap::new(),
-            compounds_next_id: 0,
-            sketch: Rc::new(RefCell::new(Sketch::new())),
-        };
-
-        for (id, point) in real_sketch.sketch.borrow().get_all_points().iter() {
-            real_sketch.points_3d.insert(
-                *id,
-                Point3::from_plane_point(&plane.borrow().clone(), point),
-            );
-        }
-
-        real_sketch
-    }
-
-    pub fn try_from_plane_description(
-        wb: &Workbench,
-        plane_description: &PlaneDescription,
-    ) -> anyhow::Result<Self> {
-        let plane = match plane_description {
-            PlaneDescription::PlaneId(plane_id) => wb
-                .planes
-                .get(plane_id)
-                .ok_or(anyhow::anyhow!("Failed to find plane with id {}", plane_id))?,
-            PlaneDescription::SolidFace {
-                solid_id: _,
-                normal: _,
-            } => todo!("Implement SolidFace"),
-        }
-        .clone();
-        Ok(Self::new(plane))
-    }
-
-    /// Helper function to go from an isotope point2D to a point_3D, as calculated during new
-    pub fn get_point_3d(
-        &self,
-        point: Rc<RefCell<ISOPoint2>>,
-    ) -> Result<(u64, Point3), CADmiumError> {
-        let cell = PrimitiveCell::Point2(point.clone());
-        let point_id = self.sketch.borrow().get_primitive_id(&cell).unwrap();
-
-        if let Some(result) = self.points_3d.get(&point_id) {
-            Ok((point_id, result.clone()))
-        } else {
-            // TODO: While I'd like to calculate and add the point_3d here, we'll pollute everything with mut
-            // let point_3d = Point3::from_plane_point(&self.plane.borrow(), &point.borrow());
-
-            // Ok((point_id,
-            //     self.points_3d
-            //         .insert(point_id, point_3d)
-            //         .ok_or(CADmiumError::Point3DCalculationFailed)?))
-            Err(CADmiumError::Point3DCalculationFailed)
-        }
-    }
-
-    pub fn sketch(&self) -> Rc<RefCell<Sketch>> {
-        self.sketch.clone()
-    }
-
-    pub fn faces(&self) -> Vec<Face> {
-        self.sketch.borrow().get_merged_faces()
-    }
-
-    pub fn get_face_ids(&self, ids: Vec<IDType>) -> Vec<Face> {
-        self.sketch
-            .borrow()
-            .get_merged_faces()
-            .iter()
-            .enumerate()
-            .filter_map(|(id, f)| {
-                if ids.contains(&(id as IDType)) {
-                    Some(f.clone())
-                } else {
-                    None
-                }
-            })
-            .collect()
-    }
-
-    pub fn find_point_ref(&self, x: f64, y: f64) -> Option<Rc<RefCell<ISOPoint2>>> {
-        self.sketch
-            .borrow()
-            .primitives()
-            .iter()
-            .find_map(|(_, prim)| {
-                if let PrimitiveCell::Point2(point_ref) = prim {
-                    let point = point_ref.borrow();
-                    if (point.x() - x).abs() < 0.0001 && (point.y() - y).abs() < 0.0001 {
-                        Some(point_ref.clone())
-                    } else {
-                        None
-                    }
-                } else {
-                    None
-                }
-            })
-    }
-}
-
-impl Identifiable for Rc<RefCell<ISketch>> {
-    type Parent = Rc<RefCell<Workbench>>;
-    const ID_NAME: &'static str = "sketch_id";
-
-    fn from_parent_id(parent: &Self::Parent, hash: StepHash) -> anyhow::Result<Self> {
-        let step = parent
-            .borrow()
-            .get_step_by_hash(hash)
-            .ok_or(anyhow::anyhow!(
-                "No step with hash {} exists in the current workbench",
-                hash
-            ))?
-            .clone();
-
-        let StepResult::Sketch(sketch) = step.borrow().result.clone() else {
-            return Err(anyhow::anyhow!(
-                "The step with hash {} is not a sketch",
-                hash
-            ));
-        };
-
-        Ok(sketch)
-    }
-}
diff --git a/packages/cadmium/src/isketch/primitive.rs b/packages/cadmium/src/isketch/primitive.rs
deleted file mode 100644
index 8ef4f2c5..00000000
--- a/packages/cadmium/src/isketch/primitive.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use cadmium_macros::message;
-use isotope::primitives::line::Line;
-use isotope::primitives::point2::Point2 as ISOPoint2;
-use isotope::primitives::PrimitiveCell;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::feature::point::Point3;
-use crate::message::MessageHandler;
-use crate::step::sketch_action::IntoSketchActionResult;
-use crate::step::{StepHash, StepResult};
-use crate::{archetypes, IDType};
-
-use super::ISketch;
-
-#[message(ISketch, rename_parent = "Sketch")]
-pub fn add_point(&mut self, x: f64, y: f64) -> anyhow::Result<Option<(IDType, StepResult)>> {
-    let point = archetypes::Point2 {
-        x,
-        y,
-        hidden: false,
-    };
-    let point_wrapped = Rc::new(RefCell::new(archetypes::WrappedPrimitive::Point2(
-        point.clone(),
-    )));
-    // TODO: link
-
-    let iso_point = ISOPoint2::new(x, y);
-    let iso_point_cell = PrimitiveCell::Point2(Rc::new(RefCell::new(iso_point.clone())));
-
-    // TODO: On plane change the 3D points have to be recalculated
-    let plane = self.plane.borrow().clone();
-    let point_id = self.sketch().borrow_mut().add_primitive(iso_point_cell)?;
-    self.points_3d
-        .insert(point_id, Point3::from_plane_point(&plane, &iso_point));
-
-    Ok(Some((point_id, point_wrapped.into_result(self))))
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddArc {
-    pub center: StepHash,
-    pub radius: f64,
-    pub clockwise: bool,
-    pub start_angle: f64,
-    pub end_angle: f64,
-}
-
-impl MessageHandler for AddArc {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let isketch = sketch_ref.borrow();
-        // let center_id = isketch.primitive_map.get(&self.center).unwrap();
-        let center_id = crate::ID_MAP
-            .with_borrow(|m| m.get(&self.center).cloned())
-            .ok_or(anyhow::anyhow!("center point not found"))?;
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let center_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(center_id).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("Center point is not a point"));
-            };
-
-        let isoarc = PrimitiveCell::Arc(Rc::new(RefCell::new(isotope::primitives::arc::Arc::new(
-            center_point.clone(),
-            self.radius,
-            self.clockwise,
-            self.start_angle,
-            self.end_angle,
-        ))));
-        let arc = archetypes::Arc2 {
-            center: self.center,
-            radius: self.radius,
-            clockwise: self.clockwise,
-            start_angle: self.start_angle,
-            end_angle: self.end_angle,
-        };
-        let arc_wrapped = Rc::new(RefCell::new(archetypes::WrappedPrimitive::Arc2(arc)));
-        // TODO: link
-
-        let arc_id = sketch.add_primitive(isoarc)?;
-        drop(sketch); // We need to drop the mutable borrow because into_result borrows the sketch
-        Ok(Some((arc_id, arc_wrapped.into_result(&isketch))))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddCircle {
-    pub center: StepHash,
-    pub radius: f64,
-}
-
-impl MessageHandler for AddCircle {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let isketch = sketch_ref.borrow();
-        // let center_id = isketch.primitive_map.get(&self.center).unwrap();
-        let center_id = crate::ID_MAP
-            .with_borrow(|m| m.get(&self.center).cloned())
-            .ok_or(anyhow::anyhow!("center point not found"))?;
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let center_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(center_id).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("Center point is not a point"));
-            };
-
-        let iso_circle = PrimitiveCell::Circle(Rc::new(RefCell::new(
-            isotope::primitives::circle::Circle::new(center_point.clone(), self.radius),
-        )));
-        let circle = archetypes::Circle2 {
-            center: self.center,
-            radius: self.radius,
-        };
-        let circle_wrapped = Rc::new(RefCell::new(archetypes::WrappedPrimitive::Circle2(circle)));
-        // TODO: link
-
-        let circle_id = sketch.add_primitive(iso_circle)?;
-        drop(sketch); // We need to drop the mutable borrow because into_result borrows the sketch
-        Ok(Some((circle_id, circle_wrapped.into_result(&isketch))))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddLine {
-    pub start: StepHash,
-    pub end: StepHash,
-}
-
-impl MessageHandler for AddLine {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let isketch = sketch_ref.borrow();
-        // let start_id = isketch.primitive_map.get(&self.start).unwrap();
-        // let end_id = isketch.primitive_map.get(&self.end).unwrap();
-        let start_id = crate::ID_MAP
-            .with_borrow(|m| m.get(&self.start).cloned())
-            .ok_or(anyhow::anyhow!("start point not found"))?;
-        let end_id = crate::ID_MAP
-            .with_borrow(|m| m.get(&self.end).cloned())
-            .ok_or(anyhow::anyhow!("end point not found"))?;
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let start_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(start_id).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("Start point is not a point"));
-            };
-        let end_point =
-            if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(end_id).unwrap() {
-                point
-            } else {
-                return Err(anyhow::anyhow!("End point is not a point"));
-            };
-
-        let iso_line = PrimitiveCell::Line(Rc::new(RefCell::new(Line::new(
-            start_point.clone(),
-            end_point.clone(),
-        ))));
-
-        let line = archetypes::Line2 {
-            start: self.start,
-            end: self.end,
-        };
-        let line_wrapped = Rc::new(RefCell::new(archetypes::WrappedPrimitive::Line2(line)));
-        // TODO: link
-
-        let line_id = sketch.add_primitive(iso_line)?;
-        drop(sketch); // We need to drop the mutable borrow because into_result borrows the sketch
-        Ok(Some((line_id, line_wrapped.into_result(&isketch))))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct DeletePrimitive {
-    id: IDType,
-}
-
-impl MessageHandler for DeletePrimitive {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Rc<RefCell<ISketch>>,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let isketch = sketch_ref.borrow();
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        sketch.delete_primitive(self.id)?;
-        Ok(None)
-    }
-}
diff --git a/packages/cadmium/src/lib.rs b/packages/cadmium/src/lib.rs
index f1c90213..38ce23ab 100644
--- a/packages/cadmium/src/lib.rs
+++ b/packages/cadmium/src/lib.rs
@@ -1,30 +1,18 @@
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-
-use feature::solid::SolidArray;
 use message::{Message, MessageResult};
-use step::StepHash;
-use tsify_next::declare;
 use wasm_bindgen::prelude::*;
 extern crate console_error_panic_hook;
 
 pub mod archetypes;
 pub mod error;
-pub mod feature;
-pub mod isketch;
+pub mod extrusion;
 pub mod message;
 pub mod project;
+pub mod realization;
+pub mod solid;
+pub mod sketch;
 pub mod step;
 pub mod workbench;
 
-#[declare]
-pub type IDType = u64;
-
-thread_local! {
-    // TODO: This is a bad solution to the hash <-> crate-internal-ID mapping problem
-    static ID_MAP: RefCell<BTreeMap<StepHash, IDType>> = RefCell::new(BTreeMap::new());
-}
-
 #[wasm_bindgen]
 pub struct Project {
     native: project::Project,
@@ -35,7 +23,6 @@ impl Project {
     #[wasm_bindgen(constructor)]
     pub fn new(name: &str) -> Project {
         console_error_panic_hook::set_once();
-        wasm_logger::init(wasm_logger::Config::default());
 
         Project {
             native: project::Project::new(name),
@@ -70,34 +57,63 @@ impl Project {
 
     #[wasm_bindgen]
     pub fn compute_constraint_errors(&mut self) {
-        // self.native.compute_constraint_errors();
+        self.native.compute_constraint_errors();
+    }
+
+    #[wasm_bindgen]
+    pub fn get_realization(&self, workbench_id: u32, max_steps: u32) -> Realization {
+        let realized = self
+            .native
+            .get_realization(workbench_id as u64, max_steps as u64);
+
+        Realization { native: realized }
     }
 
     #[wasm_bindgen]
-    pub fn get_workbench(&self, workbench_index: u32) -> workbench::Workbench {
-        // TODO: Use get() and return a Result
-        self.native
-            .workbenches
-            .get(workbench_index as usize)
-            .unwrap()
-            .borrow()
-            .clone() // This single call pollutes Clone derives for all MessageHandlers
+    pub fn get_workbench(&self, workbench_index: u32) -> String {
+        let wb = &self.native.workbenches[workbench_index as usize];
+        wb.json()
     }
 
     #[wasm_bindgen]
-    pub fn send_message(&mut self, message: &Message) -> MessageResult {
+    pub fn send_message(&mut self, message: Message) -> MessageResult {
         message.handle(&mut self.native).into()
     }
 
+    // #[wasm_bindgen(getter)]
+    // pub fn sketch(&self) -> sketch::Sketch {
+    //     sketch::Sketch::from(self.native.sketch.clone())
+    // }
+
+    // #[wasm_bindgen(setter)]
+    // pub fn set_sketch(&mut self, sketch: sketch::Sketch) {
+    //     self.native.sketch = sketch.native;
+    // }
+}
+
+#[wasm_bindgen]
+pub struct Realization {
+    native: realization::Realization,
+}
+
+#[wasm_bindgen]
+impl Realization {
+    #[wasm_bindgen]
+    pub fn to_json(&self) -> String {
+        let result = serde_json::to_string(&self.native);
+        match result {
+            Ok(json) => json,
+            Err(e) => format!("Error: {}", e),
+        }
+    }
+
+    #[wasm_bindgen]
+    pub fn solid_to_obj(&self, solid_name: String, tolerance: f64) -> String {
+        self.native.solid_to_obj(&solid_name, tolerance)
+    }
+
     #[wasm_bindgen]
-    pub fn get_workbench_solids(&self, workbench_index: u32) -> SolidArray {
-        SolidArray(
-            self.native
-                .workbenches
-                .get(workbench_index as usize)
-                .unwrap()
-                .borrow()
-                .get_solids(),
-        )
+    pub fn solid_to_step(&self, solid_name: String) -> String {
+        self.native.solid_to_step(&solid_name)
     }
 }
diff --git a/packages/cadmium/src/main.rs b/packages/cadmium/src/main.rs
index 15b4ab14..1759992a 100644
--- a/packages/cadmium/src/main.rs
+++ b/packages/cadmium/src/main.rs
@@ -2,7 +2,7 @@
 
 use std::ops::{Sub, SubAssign};
 
-use cadmium::feature::helpers::fuse;
+use cadmium::extrusion::fuse;
 use truck_meshalgo::filters::OptimizingFilter;
 use truck_meshalgo::tessellation::{MeshableShape, MeshedShape};
 use truck_modeling::builder::{translated, tsweep, vertex};
@@ -12,8 +12,6 @@ use truck_shapeops::{and, or, ShapeOpsCurve, ShapeOpsSurface};
 use truck_topology::{Shell, Solid};
 
 fn main() {
-    cadmium::Project::gen_typescript_defs();
-
     let point_a = vertex(Point3::new(0.0, 0.0, 0.0));
     let line_a = tsweep(&point_a, Vector3::new(1.0, 0.0, 0.0));
     let square_a = tsweep(&line_a, Vector3::new(0.0, 1.0, 0.0));
diff --git a/packages/cadmium/src/message.rs b/packages/cadmium/src/message.rs
new file mode 100644
index 00000000..433b6183
--- /dev/null
+++ b/packages/cadmium/src/message.rs
@@ -0,0 +1,430 @@
+use itertools::Itertools as _;
+
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+
+use crate::archetypes::PlaneDescription;
+use crate::error::CADmiumError;
+use crate::extrusion::{Direction, Extrusion, ExtrusionMode};
+use crate::project::Project;
+use crate::step::StepData;
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum MessageResult {
+    #[serde(rename = "success")]
+    Success(String),
+    #[serde(rename = "error")]
+    Error(String),
+}
+
+impl From<Result<String, anyhow::Error>> for MessageResult {
+    fn from(result: Result<String, anyhow::Error>) -> Self {
+        match result {
+            // TODO: The Success should be a stable enum
+            Ok(msg) => MessageResult::Success(format!("{{ {} }}", msg)),
+            Err(e) => MessageResult::Error(e.backtrace().to_string()),
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Message {
+    RenameWorkbench {
+        workbench_id: u64,
+        new_name: String,
+    },
+    RenameStep {
+        workbench_id: u64,
+        step_id: u64,
+        new_name: String,
+    },
+    RenameProject {
+        new_name: String,
+    },
+    DeleteLines {
+        workbench_id: u64,
+        sketch_id: String,
+        line_ids: Vec<u64>,
+    },
+    DeleteArcs {
+        workbench_id: u64,
+        sketch_id: String,
+        arc_ids: Vec<u64>,
+    },
+    DeleteCircles {
+        workbench_id: u64,
+        sketch_id: String,
+        circle_ids: Vec<u64>,
+    },
+    NewPointOnSketch {
+        workbench_id: u64,
+        sketch_id: String,
+        point_id: u64,
+        x: f64,
+        y: f64,
+    },
+    NewPointOnSketch2 {
+        workbench_id: u64,
+        sketch_id: String,
+        x: f64,
+        y: f64,
+        hidden: bool,
+    },
+    NewCircleBetweenPoints {
+        workbench_id: u64,
+        sketch_id: String,
+        center_id: u64,
+        edge_id: u64,
+    },
+    NewRectangleBetweenPoints {
+        workbench_id: u64,
+        sketch_id: String,
+        start_id: u64,
+        end_id: u64,
+    },
+    NewLineOnSketch {
+        workbench_id: u64,
+        sketch_id: String,
+        start_point_id: u64,
+        end_point_id: u64,
+    },
+    DeleteLineSegment {
+        workbench_id: u64,
+        sketch_name: String,
+        line_segment_id: u64,
+    },
+    StepSketch {
+        workbench_id: u64,
+        sketch_name: String,
+        steps: u64,
+    },
+    SolveSketch {
+        workbench_id: u64,
+        sketch_name: String,
+        max_steps: u64,
+    },
+    NewSketchOnPlane {
+        workbench_id: u64,
+        sketch_name: String,
+        plane_id: String,
+    },
+    SetSketchPlane {
+        workbench_id: u64,
+        sketch_id: String,
+        plane_id: String,
+    },
+    DeleteStep {
+        workbench_id: u64,
+        step_name: String,
+    },
+    NewExtrusion {
+        workbench_id: u64,
+        extrusion_name: String,
+        sketch_id: String,
+        face_ids: Vec<u64>,
+        length: f64,
+        offset: f64,
+        direction: Direction,
+    },
+    UpdateExtrusion {
+        workbench_id: u64,
+        extrusion_name: String,
+        extrusion_id: String,
+        sketch_id: String,
+        face_ids: Vec<u64>,
+        length: f64,
+        offset: f64,
+        direction: Direction,
+    },
+    UpdateExtrusionLength {
+        workbench_id: u64,
+        extrusion_name: String,
+        length: f64,
+    },
+}
+
+impl Message {
+    pub fn as_json(&self) -> String {
+        match serde_json::to_string(self) {
+            Ok(json) => json,
+            Err(e) => format!("Error: {}", e),
+        }
+    }
+
+    pub fn from_json(json: &str) -> Result<Message, anyhow::Error> {
+        Ok(serde_json::from_str(json)?)
+    }
+
+    pub fn handle(&self, project: &mut Project) -> Result<String, anyhow::Error> {
+        match self {
+            Message::RenameProject { new_name } => {
+                project.name = new_name.to_owned();
+                Ok(format!("\"name\": \"{}\"", new_name))
+            }
+            Message::RenameWorkbench {
+                workbench_id,
+                new_name,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                workbench.name = new_name.to_owned();
+                Ok(format!("\"name\": \"{}\"", new_name))
+            }
+            Message::RenameStep {
+                workbench_id,
+                step_id,
+                new_name,
+            } => {
+                project
+                    .get_workbench_by_id_mut(*workbench_id)?
+                    .history
+                    .get_mut(*step_id as usize)
+                    .ok_or(CADmiumError::StepIDNotFound(step_id.to_string()))?
+                    .name = new_name.to_owned();
+
+                Ok(format!("\"name\": \"{}\"", new_name))
+            }
+            Message::DeleteLines {
+                workbench_id,
+                sketch_id,
+                line_ids,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                for line_id in line_ids {
+                    sketch.delete_line_segment(*line_id);
+                }
+                Ok("".to_owned())
+            }
+            Message::DeleteArcs {
+                workbench_id,
+                sketch_id,
+                arc_ids,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                for arc_id in arc_ids {
+                    sketch.delete_arc(*arc_id);
+                }
+                Ok("".to_owned())
+            }
+            Message::DeleteCircles {
+                workbench_id,
+                sketch_id,
+                circle_ids,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                for circle_id in circle_ids {
+                    sketch.delete_circle(*circle_id);
+                }
+                Ok("".to_owned())
+            }
+            Message::NewPointOnSketch2 {
+                workbench_id,
+                sketch_id,
+                x,
+                y,
+                hidden,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                let point_id;
+                if *hidden {
+                    point_id = sketch.add_hidden_point(*x, *y);
+                } else {
+                    point_id = sketch.add_point(*x, *y);
+                }
+
+                Ok(format!("\"id\": \"{}\"", point_id))
+            }
+            Message::NewCircleBetweenPoints {
+                workbench_id,
+                sketch_id,
+                center_id,
+                edge_id,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                let circle_id = sketch.add_circle_between_points(*center_id, *edge_id);
+                Ok(format!("\"id\": \"{}\"", circle_id))
+            }
+            Message::NewRectangleBetweenPoints {
+                workbench_id,
+                sketch_id,
+                start_id,
+                end_id,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                let (point_ids, line_ids) = sketch.add_rectangle_between_points(*start_id, *end_id);
+                Ok(format!(
+                    "\"point_ids\": [{}], \"line_ids\": [{}]",
+                    point_ids.iter().join(","),
+                    line_ids.iter().join(",")
+                ))
+            }
+            Message::NewPointOnSketch {
+                workbench_id,
+                sketch_id,
+                point_id,
+                x,
+                y,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                sketch.add_point_with_id(*x, *y, *point_id)?;
+                Ok("".to_owned())
+            }
+            Message::NewLineOnSketch {
+                workbench_id,
+                sketch_id,
+                start_point_id,
+                end_point_id,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_by_id_mut(sketch_id)?;
+                let line_id = sketch.add_segment(*start_point_id, *end_point_id);
+                Ok(format!("\"id\": \"{}\"", line_id))
+            }
+            Message::DeleteLineSegment {
+                workbench_id,
+                sketch_name,
+                line_segment_id,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_mut(sketch_name)?;
+                sketch.delete_line_segment(*line_segment_id);
+                Ok("".to_owned())
+            }
+            Message::StepSketch {
+                workbench_id,
+                sketch_name,
+                steps,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_mut(sketch_name)?;
+                let mut max_change = 0.0;
+                for _ in 0..*steps {
+                    max_change = sketch.take_a_step();
+                }
+                Ok(format!("{}", max_change))
+            }
+            Message::SolveSketch {
+                workbench_id,
+                sketch_name,
+                max_steps,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let sketch = workbench.get_sketch_mut(sketch_name)?;
+                sketch.solve(*max_steps);
+                Ok("".to_owned())
+            }
+            Message::NewSketchOnPlane {
+                workbench_id,
+                sketch_name,
+                plane_id,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+
+                let new_sketch_id = workbench.add_sketch_to_plane(&sketch_name, &plane_id);
+                Ok(format!("\"sketch_id\": \"{}\"", new_sketch_id))
+            }
+            Message::SetSketchPlane {
+                workbench_id,
+                sketch_id,
+                plane_id: pid,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let step = workbench.get_step_by_id_mut(&sketch_id)?;
+                let plane_description: &mut PlaneDescription = if let StepData::Sketch { plane_description, .. } = &mut step.data {
+                    plane_description
+                } else {
+                    return Err(CADmiumError::IncorrectStepDataType("Sketch".to_owned()).into());
+                };
+
+                match plane_description {
+                    PlaneDescription::PlaneId(ref mut plane_id) => {
+                        *plane_id = pid.to_owned();
+                        Ok(format!("\"plane_id\": \"{}\"", pid))
+                    }
+                    _ => Err(CADmiumError::NotImplemented.into())
+                }
+            }
+            Message::DeleteStep {
+                workbench_id,
+                step_name,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let index = workbench.history
+                    .iter()
+                    .position(|step| step.name == *step_name)
+                    .ok_or(CADmiumError::StepNameNotFound(step_name.to_owned()))?;
+
+                // Since the index was found and not given by the user, it should be safe to remove
+                workbench.history.remove(index);
+                Ok("".to_owned())
+            }
+            Message::NewExtrusion {
+                workbench_id,
+                extrusion_name,
+                sketch_id,
+                face_ids,
+                length,
+                offset,
+                direction,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let extrusion = Extrusion::new(
+                    sketch_id.to_owned(),
+                    face_ids.to_owned(),
+                    *length,
+                    *offset,
+                    direction.to_owned(),
+                    ExtrusionMode::New,
+                );
+                let extrusion_id = workbench.add_extrusion(extrusion_name, extrusion);
+                Ok(format!("\"id\": \"{}\"", extrusion_id))
+            }
+            Message::UpdateExtrusion {
+                workbench_id,
+                extrusion_name: _extrusion_name,
+                extrusion_id,
+                sketch_id,
+                face_ids,
+                length,
+                offset,
+                direction,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let extrusion = Extrusion::new(
+                    sketch_id.to_owned(),
+                    face_ids.to_owned(),
+                    *length,
+                    *offset,
+                    direction.to_owned(),
+                    ExtrusionMode::New,
+                );
+                let as_step_data = StepData::Extrusion { extrusion };
+                workbench.update_step_data(extrusion_id, as_step_data);
+                Ok(format!("\"id\": \"{}\"", extrusion_id))
+            }
+            Message::UpdateExtrusionLength {
+                workbench_id,
+                extrusion_name,
+                length,
+            } => {
+                let workbench = project.get_workbench_by_id_mut(*workbench_id)?;
+                let step = workbench.get_step_mut(&extrusion_name)?;
+
+                if let StepData::Extrusion { extrusion } = &mut step.data {
+                    extrusion.length = *length;
+                    return Ok(format!("\"length\": {}", length));
+                }
+
+                Err(CADmiumError::IncorrectStepDataType("Extrusion".to_owned()).into())
+            }
+        }
+    }
+}
diff --git a/packages/cadmium/src/message/idwrap/de.rs b/packages/cadmium/src/message/idwrap/de.rs
deleted file mode 100644
index f8d826cb..00000000
--- a/packages/cadmium/src/message/idwrap/de.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-use std::fmt;
-
-use serde::de::{self, MapAccess, Visitor};
-use serde::{Deserialize, Deserializer, Serialize};
-
-use crate::message::{Identifiable, MessageHandler};
-
-use super::IDWrap;
-
-impl<'de, T, C> Deserialize<'de> for IDWrap<T>
-where
-    T: MessageHandler<Parent = C>
-        + Clone
-        + Serialize
-        + for<'dh> Deserialize<'dh>
-        + wasm_bindgen::convert::RefFromWasmAbi,
-    C: Identifiable,
-{
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        struct IDWrapVisitor<T> {
-            marker: std::marker::PhantomData<fn() -> T>,
-        }
-
-        impl<T> IDWrapVisitor<T> {
-            fn new() -> Self {
-                IDWrapVisitor {
-                    marker: std::marker::PhantomData,
-                }
-            }
-        }
-
-        // Implementation of Visitor trait for IDWrapVisitor
-        impl<'de, T, C> Visitor<'de> for IDWrapVisitor<IDWrap<T>>
-        where
-            T: MessageHandler<Parent = C>
-                + Clone
-                + Serialize
-                + for<'dh> Deserialize<'dh>
-                + wasm_bindgen::convert::RefFromWasmAbi,
-            C: Identifiable,
-        {
-            type Value = IDWrap<T>;
-
-            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-                formatter.write_str(format!("a map with {}", C::ID_NAME).as_str())
-            }
-
-            fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
-            where
-                V: MapAccess<'de>,
-            {
-                let mut parent_id = None;
-                let mut inner_map = serde_json::Map::new();
-
-                // Loop through the map and extract fields
-                while let Some(key) = map.next_key::<String>()? {
-                    if key == C::ID_NAME {
-                        if parent_id.is_some() {
-                            return Err(de::Error::duplicate_field("parent_id"));
-                        }
-                        parent_id = Some(map.next_value()?);
-                    } else {
-                        // Collect the rest of the map entries for inner deserialization
-                        let value: serde_json::Value = map.next_value()?;
-                        inner_map.insert(key, value);
-                    }
-                }
-
-                let id = parent_id.ok_or_else(|| de::Error::missing_field(C::ID_NAME))?;
-                let inner_value = serde_json::Value::Object(inner_map);
-                let inner = T::deserialize(inner_value).map_err(de::Error::custom)?;
-
-                // Construct the nested IDWrap structure
-                Ok(IDWrap { id, inner })
-            }
-        }
-
-        deserializer.deserialize_map(IDWrapVisitor::new())
-    }
-}
diff --git a/packages/cadmium/src/message/idwrap/mod.rs b/packages/cadmium/src/message/idwrap/mod.rs
deleted file mode 100644
index 21c09f40..00000000
--- a/packages/cadmium/src/message/idwrap/mod.rs
+++ /dev/null
@@ -1,105 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use log::warn;
-use serde::de::DeserializeOwned;
-use serde::Serialize;
-use tsify_next::Tsify;
-use wasm_bindgen::convert::RefFromWasmAbi;
-
-use crate::step::{StepHash, StepResult};
-use crate::workbench::Workbench;
-use crate::IDType;
-
-mod de;
-mod ser;
-
-use super::{Identifiable, MessageHandler, ProjectMessageHandler};
-
-#[derive(Tsify, Debug, Clone)]
-#[tsify(from_wasm_abi)]
-pub struct IDWrap<T: Clone + Serialize + DeserializeOwned + RefFromWasmAbi> {
-    pub id: StepHash,
-    pub inner: T,
-}
-
-impl<T: Clone + Serialize + DeserializeOwned + RefFromWasmAbi> IDWrap<T> {
-    pub fn new(id: StepHash, h: T) -> Self {
-        Self { id, inner: h }
-    }
-
-    pub fn id(&self) -> StepHash {
-        self.id
-    }
-
-    pub fn inner(&self) -> &T {
-        &self.inner
-    }
-}
-
-// First level message handler
-impl<'a, T> ProjectMessageHandler for IDWrap<T>
-where
-    T: MessageHandler<Parent = Rc<RefCell<Workbench>>>
-        + Clone
-        + Serialize
-        + DeserializeOwned
-        + RefFromWasmAbi,
-    crate::message::message::Message: From<Self>,
-{
-    fn handle_project_message(
-        &self,
-        project: &mut crate::project::Project,
-    ) -> anyhow::Result<Option<StepHash>> {
-        let wb_cell = T::Parent::from_parent_id(project, self.id)?;
-        let result = self.inner.handle_message(wb_cell.clone())?;
-        let (id, node) = if let Some((id, node)) = result {
-            (Some(id), node)
-        } else {
-            (None, StepResult::Empty)
-        };
-
-        let mut wb = wb_cell.borrow_mut();
-        wb.add_message_step(&self.clone().into(), node);
-        let hash = wb.history.last().map(|step| step.borrow().hash()).clone();
-
-        if let Some(id) = id {
-            if let Some(hash) = hash {
-                crate::ID_MAP.with_borrow_mut(|m| m.insert(hash, id));
-            } else {
-                warn!("IDWrap::handle_project_message: IDWrap returned an ID, but no hash was found in the workbench history");
-            }
-        }
-
-        // Return the step ID (hash) instead of the message handler returned ID
-        Ok(hash)
-    }
-}
-
-// Second level message handler
-impl<T, C, P> MessageHandler for IDWrap<T>
-where
-    T: MessageHandler<Parent = C> + Clone + Serialize + DeserializeOwned + RefFromWasmAbi,
-    C: Identifiable<Parent = P>,
-    P: Identifiable,
-{
-    type Parent = C::Parent;
-    fn handle_message(&self, parent: Self::Parent) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let msg_parent = C::from_parent_id(&parent, self.id)?;
-        self.inner.handle_message(msg_parent)
-    }
-}
-
-pub trait IDWrapable<T: MessageHandler + Clone + Serialize + DeserializeOwned + RefFromWasmAbi> {
-    fn id_wrap(self, id: StepHash) -> IDWrap<T>;
-}
-
-impl<T, C> IDWrapable<T> for T
-where
-    T: MessageHandler<Parent = C> + Clone + Serialize + DeserializeOwned + RefFromWasmAbi,
-    C: Identifiable,
-{
-    fn id_wrap(self, id: StepHash) -> IDWrap<T> {
-        IDWrap { id, inner: self }
-    }
-}
diff --git a/packages/cadmium/src/message/idwrap/ser.rs b/packages/cadmium/src/message/idwrap/ser.rs
deleted file mode 100644
index 70477d0f..00000000
--- a/packages/cadmium/src/message/idwrap/ser.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use serde::ser::SerializeMap as _;
-use serde::{Deserialize, Serialize, Serializer};
-
-use crate::message::{Identifiable, MessageHandler};
-
-use super::IDWrap;
-
-impl<T, C> Serialize for IDWrap<T>
-where
-    T: MessageHandler<Parent = C>
-        + Clone
-        + Serialize
-        + for<'de> Deserialize<'de>
-        + wasm_bindgen::convert::RefFromWasmAbi,
-    C: Identifiable,
-{
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        // Create a serializer map with the appropriate capacity
-        let mut map = serializer.serialize_map(Some(1))?;
-        // Add the id field using the name from the Identifiable trait
-        map.serialize_entry(C::ID_NAME, &self.id)?;
-        // Add the inner object fields
-        serde_json::to_value(&self.inner)
-            .map_err(serde::ser::Error::custom)?
-            .as_object()
-            .ok_or_else(|| serde::ser::Error::custom("Expected object"))?
-            .iter()
-            .try_for_each(|(k, v)| {
-                map.serialize_entry(k, v)?;
-                Ok(())
-            })?;
-        map.end()
-    }
-}
diff --git a/packages/cadmium/src/message/message.rs b/packages/cadmium/src/message/message.rs
deleted file mode 100644
index 31e02f7c..00000000
--- a/packages/cadmium/src/message/message.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-use cadmium_macros::MessageEnum;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::step::StepHash;
-
-use super::idwrap::IDWrap;
-use super::ProjectMessageHandler;
-
-#[derive(MessageEnum, Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-#[serde(tag = "type")]
-pub enum Message {
-    ProjectRename(crate::project::ProjectRename),
-    WorkbenchRename(IDWrap<crate::workbench::WorkbenchRename>),
-    WorkbenchPointAdd(IDWrap<crate::workbench::AddPoint>),
-    WorkbenchPlaneAdd(IDWrap<crate::workbench::AddPlane>),
-    WorkbenchSketchAdd(IDWrap<crate::workbench::AddSketch>),
-    WorkbenchSketchSetPlane(IDWrap<crate::workbench::SetSketchPlane>),
-    WorkbenchPointUpdate(IDWrap<IDWrap<crate::feature::point::WorkbenchPointUpdate>>),
-
-    SketchAddPoint(IDWrap<IDWrap<crate::isketch::primitive::SketchAddPointMessage>>),
-    SketchAddArc(IDWrap<IDWrap<crate::isketch::primitive::AddArc>>),
-    SketchAddCircle(IDWrap<IDWrap<crate::isketch::primitive::AddCircle>>),
-    SketchAddLine(IDWrap<IDWrap<crate::isketch::primitive::AddLine>>),
-    SketchAddRectangle(IDWrap<IDWrap<crate::isketch::compound_rectangle::Add>>),
-    SketchDeletePrimitive(IDWrap<IDWrap<crate::isketch::primitive::DeletePrimitive>>),
-
-    FeatureExtrusionAdd(IDWrap<crate::feature::extrusion::Add>),
-
-    StepRename(IDWrap<IDWrap<crate::step::actions::Rename>>),
-    StepDelete(IDWrap<crate::step::actions::Delete>),
-}
-
-#[derive(Tsify, Debug, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct MessageResult {
-    pub success: bool,
-    pub data: String,
-}
-
-impl From<anyhow::Result<Option<StepHash>>> for MessageResult {
-    fn from(result: anyhow::Result<Option<StepHash>>) -> Self {
-        match result {
-            // TODO: The Success should be a stable enum
-            Ok(msg) => Self {
-                success: true,
-                data: if let Some(id) = msg {
-                    id.to_string()
-                } else {
-                    "null".to_string()
-                },
-            },
-            Err(e) => Self {
-                success: false,
-                data: e.to_string() + "\n\n" + e.backtrace().to_string().as_str(),
-            },
-        }
-    }
-}
diff --git a/packages/cadmium/src/message/mod.rs b/packages/cadmium/src/message/mod.rs
deleted file mode 100644
index 81efab57..00000000
--- a/packages/cadmium/src/message/mod.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use crate::step::{StepHash, StepResult};
-use crate::IDType;
-
-pub mod idwrap;
-pub mod message;
-
-pub use message::{Message, MessageResult};
-use serde::{Deserialize, Serialize};
-use wasm_bindgen::convert::RefFromWasmAbi;
-
-pub trait Identifiable: Sized {
-    type Parent;
-    const ID_NAME: &'static str;
-    fn from_parent_id(parent: &Self::Parent, hash: StepHash) -> Result<Self, anyhow::Error>;
-}
-
-pub trait ProjectMessageHandler: RefFromWasmAbi {
-    fn handle_project_message(
-        &self,
-        project: &mut crate::project::Project,
-    ) -> anyhow::Result<Option<StepHash>>;
-}
-
-pub trait MessageHandler: Serialize + for<'de> Deserialize<'de> + RefFromWasmAbi {
-    type Parent: Identifiable;
-    fn handle_message(&self, item: Self::Parent) -> anyhow::Result<Option<(IDType, StepResult)>>;
-}
diff --git a/packages/cadmium/src/project.rs b/packages/cadmium/src/project.rs
index bf6954d8..67dd21ec 100644
--- a/packages/cadmium/src/project.rs
+++ b/packages/cadmium/src/project.rs
@@ -1,30 +1,22 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use log::error;
 use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
+use tsify::Tsify;
 use wasm_bindgen::prelude::*;
 
-use crate::archetypes::Plane;
+use crate::archetypes::*;
 use crate::error::CADmiumError;
-use crate::message::idwrap::IDWrap;
-use crate::message::ProjectMessageHandler;
-use crate::step::StepHash;
-use crate::workbench::{AddPlane, AddPoint, Workbench};
-
-#[derive(Tsify, Debug, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Assembly {
-    name: String,
-}
+use crate::realization::Realization;
+use crate::sketch::constraints::Constraint;
+use crate::sketch::{Face, Point2, Sketch};
+use crate::step::StepData;
+use crate::workbench::Workbench;
+use std::collections::HashMap;
 
 #[derive(Tsify, Debug, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Project {
     pub name: String,
     pub assemblies: Vec<Assembly>,
-    pub workbenches: Vec<Rc<RefCell<Workbench>>>,
+    pub workbenches: Vec<Workbench>,
 }
 
 impl Project {
@@ -35,56 +27,12 @@ impl Project {
             workbenches: vec![],
         };
 
-        p.add_workbench("Workbench 1");
+        let wb = Workbench::new("Workbench 1");
+        p.workbenches.push(wb);
 
         p
     }
 
-    pub fn add_workbench(&mut self, name: &str) {
-        let wb = Workbench::new(name);
-        let wb_cell = Rc::new(RefCell::new(wb));
-        self.workbenches.push(wb_cell.clone());
-        let wb_id = self.workbenches.len() as u64 - 1;
-        let wb_hash = StepHash::from_int(wb_id);
-
-        IDWrap {
-            id: wb_hash.clone(),
-            inner: AddPoint {
-                x: 0.0,
-                y: 0.0,
-                z: 0.0,
-            },
-        }
-        .handle_project_message(self)
-        .unwrap()
-        .unwrap();
-
-        for plane_inst in [Plane::top(), Plane::front(), Plane::right()].iter() {
-            IDWrap {
-                id: wb_hash.clone(),
-                inner: AddPlane {
-                    plane: plane_inst.clone(),
-                    width: 100.0,
-                    height: 100.0,
-                },
-            }
-            .handle_project_message(self)
-            .unwrap()
-            .unwrap();
-        }
-
-        let wb_ref = wb_cell.borrow();
-        wb_ref.history.get(0).unwrap().borrow_mut().name = "Origin".to_string();
-        wb_ref.history.get(1).unwrap().borrow_mut().name = "Top Plane".to_string();
-        wb_ref.history.get(2).unwrap().borrow_mut().name = "Front Plane".to_string();
-        wb_ref.history.get(3).unwrap().borrow_mut().name = "Right Plane".to_string();
-        assert_eq!(wb_ref.history.len(), 4);
-        assert_eq!(wb_ref.points.len(), 1);
-        assert_eq!(wb_ref.planes.len(), 3);
-        assert_eq!(wb_ref.points_next_id, 1);
-        assert_eq!(wb_ref.planes_next_id, 3);
-    }
-
     pub fn json(&self) -> String {
         let result = serde_json::to_string(self);
         match result {
@@ -98,375 +46,404 @@ impl Project {
         match result {
             Ok(p) => p,
             Err(e) => {
-                error!("Error: {}", e);
+                println!("Error: {}", e);
                 Project::new("Error")
             }
         }
     }
 
-    // pub fn compute_constraint_errors(&mut self) {
-    //     for workbench in self.workbenches.iter_mut() {
-    //         for step in workbench.history.iter_mut() {
-    //             match &mut step.data {
-    //                 StepData::Sketch { sketch, .. } => {
-    //                     sketch.compute_constraint_errors();
-    //                 }
-    //                 _ => {}
-    //             }
-    //         }
-    //     }
-    // }
+    pub fn compute_constraint_errors(&mut self) {
+        for workbench in self.workbenches.iter_mut() {
+            for step in workbench.history.iter_mut() {
+                match &mut step.data {
+                    StepData::Sketch { sketch, .. } => {
+                        sketch.compute_constraint_errors();
+                    }
+                    _ => {}
+                }
+            }
+        }
+    }
 
-    pub fn get_workbench_by_id(&self, id: u64) -> Result<Rc<RefCell<Workbench>>, CADmiumError> {
+    pub fn get_workbench_mut(&mut self, name: &str) -> Result<&mut Workbench, CADmiumError> {
         self.workbenches
-            .get(id as usize)
-            .cloned()
-            .ok_or(CADmiumError::WorkbenchIDNotFound(id))
+            .iter_mut()
+            .find(|wb| wb.name == name)
+            .ok_or(CADmiumError::WorkbenchNameNotFound(name.to_string()))
     }
 
-    pub fn get_workbench_by_name(
-        &self,
-        name: &str,
-    ) -> Result<Rc<RefCell<Workbench>>, CADmiumError> {
+    pub fn get_workbench_by_id_mut(&mut self, id: u64) -> Result<&mut Workbench, CADmiumError> {
         self.workbenches
-            .iter()
-            .find(|wb| wb.borrow().name == name)
-            .cloned()
-            .ok_or(CADmiumError::WorkbenchNameNotFound(name.to_string()))
+            .get_mut(id as usize)
+            .ok_or(CADmiumError::WorkbenchIDNotFound(id))
     }
+
+    pub fn get_realization(&self, workbench_id: u64, max_steps: u64) -> Realization {
+        let workbench = &self.workbenches[workbench_id as usize];
+        let realization = workbench.realize(max_steps);
+        realization
+    }
+}
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Assembly {
+    name: String,
 }
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct ProjectRename {
-    new_name: String,
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct RealSketch {
+    pub plane_id: String,
+    pub plane_name: String,
+    pub points: HashMap<u64, Point3>,
+    pub points_2d: HashMap<u64, Point2>,
+    pub highest_point_id: u64,
+    pub line_segments: HashMap<u64, Line3>,
+    pub highest_line_segment_id: u64,
+    pub circles: HashMap<u64, Circle3>,
+    pub highest_circle_id: u64,
+    pub arcs: HashMap<u64, Arc3>,
+    pub highest_arc_id: u64,
+    pub constraints: HashMap<u64, Constraint>,
+    pub highest_constraint_id: u64,
+    pub faces: Vec<Face>,
 }
 
-impl ProjectMessageHandler for ProjectRename {
-    fn handle_project_message(
-        &self,
-        project: &mut crate::project::Project,
-    ) -> anyhow::Result<Option<StepHash>> {
-        project.name = self.new_name.clone();
-        Ok(None)
+impl RealSketch {
+    pub fn new(plane_name: &str, plane_id: &str, plane: &RealPlane, sketch: &Sketch) -> Self {
+        // The key difference between Sketch and RealSketch is that Sketch lives
+        // in 2D and RealSketch lives in 3D. So we need to convert the points
+
+        let mut real_sketch = RealSketch {
+            plane_name: plane_name.to_owned(),
+            plane_id: plane_id.to_owned(),
+            points_2d: HashMap::new(),
+            points: HashMap::new(),
+            highest_point_id: 0,
+            line_segments: HashMap::new(),
+            highest_line_segment_id: 0,
+            circles: HashMap::new(),
+            highest_circle_id: 0,
+            arcs: HashMap::new(),
+            highest_arc_id: 0,
+            constraints: HashMap::new(),
+            highest_constraint_id: 0,
+            faces: vec![],
+        };
+
+        let o = plane.plane.origin.clone();
+        let x = plane.plane.primary.clone();
+        let y = plane.plane.secondary.clone();
+
+        for (point_id, point) in sketch.points.iter() {
+            let pt3 = o.plus(x.times(point.x)).plus(y.times(point.y));
+            let mut real_point = Point3::new(pt3.x, pt3.y, pt3.z);
+            if point.hidden {
+                real_point.hidden = true;
+            }
+            real_sketch.points.insert(*point_id, real_point);
+
+            let pt2 = point.clone();
+            real_sketch.points_2d.insert(*point_id, pt2);
+        }
+        real_sketch.highest_point_id = sketch.highest_point_id;
+
+        for (line_id, line) in sketch.line_segments.iter() {
+            let real_line = Line3 {
+                start: line.start,
+                end: line.end,
+            };
+            real_sketch.line_segments.insert(*line_id, real_line);
+        }
+
+        for (circle_id, circle) in sketch.circles.iter() {
+            let real_circle = Circle3 {
+                center: circle.center,
+                radius: circle.radius,
+                top: circle.top,
+            };
+            real_sketch.circles.insert(*circle_id, real_circle);
+        }
+
+        // let mut arc3_lookup: HashMap<(u64, u64, u64), Arc3> = HashMap::new();
+        for (arc_id, arc) in sketch.arcs.iter() {
+            // println!("\nConverting arc to points");
+            // let as_points = sketch.arc_to_points(arc);
+            // println!("How many points? {}", as_points.len());
+            // let transit = as_points[as_points.len() / 2].clone();
+
+            // let transit_3d = o.plus(x.times(transit.x)).plus(y.times(transit.y));
+            // let mut real_point = Point3::new(transit_3d.x, transit_3d.y, transit_3d.z);
+            // real_point.hidden = true;
+
+            // let point_id = real_sketch.highest_point_id + 1;
+            // real_sketch.points.insert(point_id, real_point);
+            // real_sketch.points_2d.insert(point_id, transit);
+            // real_sketch.highest_point_id += 1;
+
+            let real_arc = Arc3 {
+                center: arc.center,
+                start: arc.start,
+                end: arc.end,
+                // transit: point_id,
+                clockwise: arc.clockwise,
+            };
+            real_sketch.arcs.insert(*arc_id, real_arc);
+            // arc3_lookup.insert((arc.start, arc.end, arc.center), real_arc);
+        }
+
+        for (constraint_id, constraint) in sketch.constraints.iter() {
+            let real_constraint = constraint.clone();
+            real_sketch
+                .constraints
+                .insert(*constraint_id, real_constraint);
+        }
+
+        let (faces, _unused_segments) = sketch.find_faces();
+        real_sketch.faces = faces;
+
+        real_sketch
     }
 }
 
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct RealPlane {
+    pub plane: Plane,
+    pub name: String,
+    pub width: f64,
+    pub height: f64,
+}
+
 #[cfg(test)]
 pub mod tests {
+    use truck_polymesh::obj;
 
-    use crate::archetypes::PlaneDescription;
-
-    use crate::feature::extrusion;
-    use crate::feature::extrusion::{Direction, Mode};
-    use crate::isketch::primitive::{AddLine, SketchAddPointMessage};
-    use crate::message::idwrap::IDWrap;
-    use crate::message::MessageHandler;
-    use crate::step;
-    use crate::workbench::{AddSketch, SetSketchPlane};
+    use crate::extrusion::Direction;
+    use crate::extrusion::Extrusion;
+    use crate::extrusion::ExtrusionMode;
+    use crate::message::Message;
+    use truck_meshalgo::filters::*;
+    use truck_meshalgo::tessellation::*;
 
     use super::*;
 
-    pub const WORKBENCH_HASH: StepHash = StepHash::from_int(0);
-
     pub fn create_test_project() -> Project {
         let mut p = Project::new("Test Project");
-        let plane_description = PlaneDescription::PlaneId(0);
-        let sketch_id = IDWrap {
-            id: WORKBENCH_HASH,
-            inner: AddSketch { plane_description },
-        }
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
-
-        add_test_rectangle(&mut p, sketch_id, 0.0, 0.0, 40.0, 40.0);
-
-        IDWrap {
-            id: WORKBENCH_HASH,
-            inner: extrusion::Add {
-                sketch_id,
-                faces: vec![0],
-                length: 25.0,
-                offset: 0.0,
-                direction: Direction::Normal,
-                mode: Mode::New,
-            },
-        }
-        .handle_project_message(&mut p)
-        .unwrap()
-        .unwrap();
+        let wb = p.workbenches.get_mut(0).unwrap();
+        wb.add_sketch_to_plane("Sketch 1", "Plane-0");
+        let s = wb.get_sketch_mut("Sketch 1").unwrap();
+        let ll = s.add_point(0.0, 0.0);
+        let lr = s.add_point(40.0, 0.0);
+        let ul = s.add_point(0.0, 40.0);
+        let ur = s.add_point(40.0, 40.0);
+        s.add_segment(ll, lr);
+        s.add_segment(lr, ur);
+        s.add_segment(ur, ul);
+        s.add_segment(ul, ll);
+
+        let extrusion = Extrusion::new(
+            "Sketch-0".to_owned(),
+            vec![0],
+            25.0,
+            0.0,
+            Direction::Normal,
+            ExtrusionMode::New,
+        );
+        wb.add_extrusion("Ext1", extrusion);
 
         p
     }
 
-    pub fn add_test_rectangle(
-        p: &mut Project,
-        sketch_id: StepHash,
-        x_start: f64,
-        y_start: f64,
-        x_end: f64,
-        y_end: f64,
-    ) {
-        let ll = IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: SketchAddPointMessage {
-                    x: x_start,
-                    y: y_start,
-                },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        let lr = IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: SketchAddPointMessage {
-                    x: x_end,
-                    y: y_start,
-                },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        let ul = IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: SketchAddPointMessage {
-                    x: x_start,
-                    y: y_end,
-                },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        let ur = IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: SketchAddPointMessage { x: x_end, y: y_end },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-
-        IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddLine { start: ll, end: lr },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddLine { start: lr, end: ur },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddLine { start: ur, end: ul },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-        IDWrap {
-            id: WORKBENCH_HASH,
-            inner: IDWrap {
-                id: sketch_id,
-                inner: AddLine { start: ul, end: ll },
-            },
-        }
-        .handle_project_message(p)
-        .unwrap()
-        .unwrap();
-    }
-
     #[test]
     fn one_extrusion() {
         let p = create_test_project();
 
-        let workbench_ref = p.get_workbench_by_id(0).unwrap();
-        let workbench = workbench_ref.borrow();
-        let solids = &workbench.features;
-        println!("solids: {:?}", solids);
+        let realization = p.get_realization(0, 1000);
+        let solids = realization.solids;
+
+        let solid = &solids["Ext1:0"];
 
-        assert_eq!(solids.len(), 1);
+        println!("{:?}", solid);
     }
 
-    #[test]
-    fn move_sketch() {
-        let p = create_test_project();
-        let workbench_ref = p.get_workbench_by_id(0).unwrap();
+    // #[test]
+    // fn move_sketch() {
+    //     let mut p = Project::new("Test Project");
 
-        SetSketchPlane {
-            sketch_id: 0,
-            plane_description: PlaneDescription::PlaneId(1),
-        }
-        .handle_message(workbench_ref.clone())
-        .unwrap();
-    }
+    //     let right_plane_id = p.workbenches[0].plane_name_to_id("Right").unwrap();
 
-    #[test]
-    fn rename_step() {
-        let p = create_test_project();
-        let workbench_ref = p.get_workbench_by_id(0).unwrap();
-        let workbench = workbench_ref.borrow();
-        let new_name = "New Extrusion Name".to_string();
-        let target = workbench.history.last().unwrap();
+    //     let message = &Message::SetSketchPlane {
+    //         workbench_id: 0,
+    //         sketch_id: "Sketch-0".to_owned(),
+    //         plane_id: right_plane_id,
+    //     };
 
-        step::actions::Rename {
-            new_name: new_name.clone(),
-        }
-        .handle_message(target.clone())
-        .unwrap();
+    //     let result = p.handle_message(message);
+    //     match result {
+    //         Ok(res) => println!("{}", res),
+    //         Err(e) => println!("{}", e),
+    //     }
+    //     // println!("{:?}", result);
 
-        assert_eq!(target.borrow().name, new_name);
-    }
+    //     let realization = p.get_realization(0, 1000);
+    // }
 
     #[test]
-    #[ignore = "uses old filetype"]
-    fn circle_crashing() {
-        let file_contents =
-            std::fs::read_to_string("src/test_inputs/circle_crashing_2.cadmium").unwrap();
+    fn rename_plane() {
+        let mut p = create_test_project();
 
-        let p = Project::from_json(&file_contents);
+        let message = &Message::RenameStep {
+            workbench_id: 0,
+            step_id: 1,
+            new_name: "Top-2".to_owned(),
+        };
 
-        let workbench_ref = p.get_workbench_by_id(0).unwrap();
-        let workbench = workbench_ref.borrow();
-        println!("{:?}", workbench);
+        let result = message.handle(&mut p);
+        match result {
+            Ok(res) => println!("{}", res),
+            Err(e) => println!("{}", e),
+        }
+        // let realization = p.get_realization(0, 1000);
     }
 
+    // Removed because this seems pretty redundant with all the other tests that read .cadmium files
     // #[test]
-    // fn bruno() {
-    //     let mut p = create_test_project();
-    //     let wb = p.workbenches.get_mut(0).unwrap();
-
-    //     let s2_id = wb.add_sketch_to_solid_face("Sketch-2", "Ext1:0", Vector3::new(0.0, 0.0, 1.0));
-    //     let s2 = wb.get_sketch_mut("Sketch-2").unwrap();
-
-    //     // smaller
-    //     let ll = s2.add_point(12.0, 12.0);
-    //     let lr = s2.add_point(32.0, 12.0);
-    //     let ul = s2.add_point(12.0, 32.0);
-    //     let ur = s2.add_point(32.0, 32.0);
-    //     // bigger!
-    //     // let ll = s2.add_point(-10.0, -10.0);
-    //     // let lr = s2.add_point(50.0, -10.0);
-    //     // let ul = s2.add_point(-10.0, 50.0);
-    //     // let ur = s2.add_point(50.0, 50.0);
-    //     s2.add_segment(ll, lr);
-    //     s2.add_segment(lr, ur);
-    //     s2.add_segment(ur, ul);
-    //     s2.add_segment(ul, ll);
-
-    //     // println!("S2: {:?}", s2);
-
-    //     let extrusion2 = Extrusion::new(
-    //         s2_id.to_owned(),
-    //         vec![0],
-    //         25.0,
-    //         0.0,
-    //         Direction::Normal,
-    //         ExtrusionMode::Add(vec!["Ext1:0".to_string()]),
-    //     );
-    //     wb.add_extrusion("Ext2", extrusion2);
-
-    //     wb.add_sketch_to_plane("Sketch 3", "Plane-1");
-    //     let s3 = wb.get_sketch_mut("Sketch 3").unwrap();
-    //     let center = s3.add_point(20.0, 15.0);
-    //     s3.add_circle(center, 5.0);
-
-    //     let extrusion3 = Extrusion::new(
-    //         "Sketch-2".to_owned(),
-    //         vec![0],
-    //         50.0,
-    //         0.0,
-    //         Direction::NegativeNormal,
-    //         ExtrusionMode::Remove(vec!["Ext1:0".to_string()]),
-    //     );
-    //     wb.add_extrusion("Ext3", extrusion3);
-
-    //     let realization = p.get_realization(0, 1000);
-    //     let solids = realization.solids;
-
-    //     let num_solids = solids.len();
-    //     println!("Num Solids: {:?}", num_solids);
-    //     assert!(num_solids == 1);
+    // fn to_and_from_json() {
+    //     // let mut p = Project::new("Test Project");
 
-    //     let final_solid = &solids["Ext1:0"];
-    //     println!("Final solid: {:?}", final_solid.truck_solid);
-    //     let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon();
-    //     mesh.put_together_same_attrs();
-    //     let file = std::fs::File::create("pkg/bruno.obj").unwrap();
-    //     obj::write(&mesh, file).unwrap();
+    //     let file_contents =
+    //         std::fs::read_to_string("/Users/matthewferraro/Downloads/first_project.cadmium")
+    //             .unwrap();
 
-    //     let file = std::fs::File::create("pkg/bruno.json").unwrap();
-    //     serde_json::to_writer(file, &p).unwrap();
+    //     let p2 = Project::from_json(&file_contents);
+    //     println!("{:?}", p2);
     // }
 
-    // #[test]
-    // fn secondary_extrusion_with_merge() {
-    //     let mut p = create_test_project();
-    //     let wb = p.workbenches.get_mut(0).unwrap();
-
-    //     let s2_id = wb.add_sketch_to_solid_face("Sketch-2", "Ext1:0", Vector3::new(0.0, 0.0, 1.0));
-    //     let s2 = wb.get_sketch_mut("Sketch-2").unwrap();
-
-    //     // smaller
-    //     let ll = s2.add_point(12.0, 0.0);
-    //     let lr = s2.add_point(32.0, 0.0);
-    //     let ul = s2.add_point(12.0, 32.0);
-    //     let ur = s2.add_point(32.0, 32.0);
-    //     s2.add_segment(ll, lr);
-    //     s2.add_segment(lr, ur);
-    //     s2.add_segment(ur, ul);
-    //     s2.add_segment(ul, ll);
-
-    //     // println!("S2: {:?}", s2);
-
-    //     let extrusion2 = Extrusion::new(
-    //         s2_id.to_owned(),
-    //         vec![0],
-    //         25.0,
-    //         0.0,
-    //         Direction::Normal,
-    //         ExtrusionMode::Add(vec!["Ext1:0".to_string()]),
-    //     );
-    //     wb.add_extrusion("Ext2", extrusion2);
+    #[test]
+    fn circle_crashing() {
+        let file_contents =
+            std::fs::read_to_string("src/test_inputs/circle_crashing_2.cadmium").unwrap();
 
-    //     let realization = p.get_realization(0, 1000);
-    //     let solids = realization.solids;
+        let p2 = Project::from_json(&file_contents);
 
-    //     let num_solids = solids.len();
-    //     println!("Num Solids: {:?}", num_solids);
-    //     assert!(num_solids == 1);
+        let realization = p2.get_realization(0, 1000);
+        println!("{:?}", realization);
+    }
 
-    //     let final_solid = &solids["Ext1:0"];
-    //     let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon();
-    //     mesh.put_together_same_attrs();
-    //     let file = std::fs::File::create("secondary_extrusion.obj").unwrap();
-    //     obj::write(&mesh, file).unwrap();
+    // #[test]
+    fn bruno() {
+        let mut p = create_test_project();
+        let wb = p.workbenches.get_mut(0).unwrap();
+
+        let s2_id = wb.add_sketch_to_solid_face("Sketch-2", "Ext1:0", Vector3::new(0.0, 0.0, 1.0));
+        let s2 = wb.get_sketch_mut("Sketch-2").unwrap();
+
+        // smaller
+        let ll = s2.add_point(12.0, 12.0);
+        let lr = s2.add_point(32.0, 12.0);
+        let ul = s2.add_point(12.0, 32.0);
+        let ur = s2.add_point(32.0, 32.0);
+        // bigger!
+        // let ll = s2.add_point(-10.0, -10.0);
+        // let lr = s2.add_point(50.0, -10.0);
+        // let ul = s2.add_point(-10.0, 50.0);
+        // let ur = s2.add_point(50.0, 50.0);
+        s2.add_segment(ll, lr);
+        s2.add_segment(lr, ur);
+        s2.add_segment(ur, ul);
+        s2.add_segment(ul, ll);
+
+        // println!("S2: {:?}", s2);
+
+        let extrusion2 = Extrusion::new(
+            s2_id.to_owned(),
+            vec![0],
+            25.0,
+            0.0,
+            Direction::Normal,
+            ExtrusionMode::Add(vec!["Ext1:0".to_string()]),
+        );
+        wb.add_extrusion("Ext2", extrusion2);
+
+        wb.add_sketch_to_plane("Sketch 3", "Plane-1");
+        let s3 = wb.get_sketch_mut("Sketch 3").unwrap();
+        let center = s3.add_point(20.0, 15.0);
+        s3.add_circle(center, 5.0);
+
+        let extrusion3 = Extrusion::new(
+            "Sketch-2".to_owned(),
+            vec![0],
+            50.0,
+            0.0,
+            Direction::NegativeNormal,
+            ExtrusionMode::Remove(vec!["Ext1:0".to_string()]),
+        );
+        wb.add_extrusion("Ext3", extrusion3);
+
+        let realization = p.get_realization(0, 1000);
+        let solids = realization.solids;
+
+        let num_solids = solids.len();
+        println!("Num Solids: {:?}", num_solids);
+        assert!(num_solids == 1);
+
+        let final_solid = &solids["Ext1:0"];
+        println!("Final solid: {:?}", final_solid.truck_solid);
+        let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon();
+        mesh.put_together_same_attrs(0.1);
+        let file = std::fs::File::create("pkg/bruno.obj").unwrap();
+        obj::write(&mesh, file).unwrap();
+
+        let file = std::fs::File::create("pkg/bruno.json").unwrap();
+        serde_json::to_writer(file, &p).unwrap();
+    }
 
-    //     let file = std::fs::File::create("secondary_extrusion.json").unwrap();
-    //     serde_json::to_writer(file, &p).unwrap();
-    // }
+    // #[test]
+    fn secondary_extrusion_with_merge() {
+        let mut p = create_test_project();
+        let wb = p.workbenches.get_mut(0).unwrap();
+
+        let s2_id = wb.add_sketch_to_solid_face("Sketch-2", "Ext1:0", Vector3::new(0.0, 0.0, 1.0));
+        let s2 = wb.get_sketch_mut("Sketch-2").unwrap();
+
+        // smaller
+        let ll = s2.add_point(12.0, 0.0);
+        let lr = s2.add_point(32.0, 0.0);
+        let ul = s2.add_point(12.0, 32.0);
+        let ur = s2.add_point(32.0, 32.0);
+        s2.add_segment(ll, lr);
+        s2.add_segment(lr, ur);
+        s2.add_segment(ur, ul);
+        s2.add_segment(ul, ll);
+
+        // println!("S2: {:?}", s2);
+
+        let extrusion2 = Extrusion::new(
+            s2_id.to_owned(),
+            vec![0],
+            25.0,
+            0.0,
+            Direction::Normal,
+            ExtrusionMode::Add(vec!["Ext1:0".to_string()]),
+        );
+        wb.add_extrusion("Ext2", extrusion2);
+
+        let realization = p.get_realization(0, 1000);
+        let solids = realization.solids;
+
+        let num_solids = solids.len();
+        println!("Num Solids: {:?}", num_solids);
+        assert!(num_solids == 1);
+
+        let final_solid = &solids["Ext1:0"];
+        let mut mesh = final_solid.truck_solid.triangulation(0.02).to_polygon();
+        mesh.put_together_same_attrs(0.1);
+        let file = std::fs::File::create("secondary_extrusion.obj").unwrap();
+        obj::write(&mesh, file).unwrap();
+
+        let file = std::fs::File::create("secondary_extrusion.json").unwrap();
+        serde_json::to_writer(file, &p).unwrap();
+    }
 }
diff --git a/packages/cadmium/src/realization.rs b/packages/cadmium/src/realization.rs
new file mode 100644
index 00000000..e0cd1e49
--- /dev/null
+++ b/packages/cadmium/src/realization.rs
@@ -0,0 +1,52 @@
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+use wasm_bindgen::prelude::*;
+
+use crate::archetypes::Point3;
+use crate::project::{RealPlane, RealSketch};
+use crate::solid::Solid;
+use std::collections::HashMap;
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Realization {
+    // a Realization is what you get if you apply the steps in a Workbench's
+    // history and build a bunch of geometry
+    pub planes: HashMap<String, RealPlane>,
+    pub points: HashMap<String, Point3>,
+    pub sketches: HashMap<String, (RealSketch, RealSketch, String)>,
+    pub solids: HashMap<String, Solid>,
+}
+
+impl Realization {
+    pub fn new() -> Self {
+        Realization {
+            planes: HashMap::new(),
+            points: HashMap::new(),
+            sketches: HashMap::new(),
+            solids: HashMap::new(),
+        }
+    }
+
+    pub fn solid_to_obj(&self, solid_name: &str, tolerance: f64) -> String {
+        let solid = &self.solids[solid_name];
+        let obj_text = solid.to_obj_string(tolerance);
+        obj_text
+    }
+
+    pub fn save_solid_as_obj_file(&self, solid_name: &str, filename: &str, tolerance: f64) {
+        let solid = &self.solids[solid_name];
+        solid.save_as_obj(filename, tolerance);
+    }
+
+    pub fn solid_to_step(&self, solid_name: &str) -> String {
+        let solid = &self.solids[solid_name];
+        let step_text = solid.to_step_string();
+        step_text
+    }
+
+    pub fn save_solid_as_step_file(&self, solid_name: &str, filename: &str) {
+        let solid = &self.solids[solid_name];
+        solid.save_as_step(filename)
+    }
+}
diff --git a/packages/cadmium/src/sketch/constraints.rs b/packages/cadmium/src/sketch/constraints.rs
new file mode 100644
index 00000000..f12382c9
--- /dev/null
+++ b/packages/cadmium/src/sketch/constraints.rs
@@ -0,0 +1,294 @@
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+
+use crate::sketch::{Arc2, Circle2, IncrementingMap, Line2, Point2, Sketch};
+use std::collections::HashMap;
+use std::f64::consts::{PI, TAU};
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
+pub enum Constraint {
+    SegmentLength {
+        segment_id: u64,
+        length: f64,
+        normal_offset: f64,
+        parallel_offset: f64,
+        kp: f64, // kp is the proportional gain, the spring constant
+        kd: f64, // kd is the derivative gain, the damping constant
+        error: f64,
+    },
+    SegmentAngle {
+        segment_id: u64,
+        angle: f64,
+        x_offset: f64,
+        y_offset: f64,
+        kp: f64,
+        kd: f64,
+        error: f64,
+    },
+    CircleDiameter {
+        circle_id: u64,
+        diameter: f64,
+        angle_offset: f64,
+        r_offset: f64,
+        kp: f64,
+        kd: f64,
+        error: f64,
+    },
+    SegmentsEqual {
+        segment_a_id: u64,
+        segment_b_id: u64,
+        kp: f64,
+        kd: f64,
+        error: f64,
+    },
+}
+
+impl Sketch {
+    pub fn add_segment_length_constraint(&mut self, segment_id: u64, length: f64) -> u64 {
+        let mut constraint = Constraint::SegmentLength {
+            segment_id,
+            length,
+            normal_offset: 0.15,
+            parallel_offset: 0.0,
+            kp: 2.0,
+            kd: 0.3,
+            error: 0.0,
+        };
+
+        let id = self.highest_constraint_id + 1;
+        self.constraints.insert(id, constraint);
+        self.highest_constraint_id += 1;
+
+        let err = self.constraint_error(id);
+        let c = self.constraints.get_mut(&id).unwrap();
+        if let Constraint::SegmentLength { error, .. } = c {
+            *error = err;
+        }
+
+        id
+    }
+
+    pub fn add_segment_vertical_constraint(&mut self, segment_id: u64) -> u64 {
+        let current_angle = self.segment_angle(segment_id);
+        if current_angle >= 0.0 {
+            // it roughly points up
+            self.add_segment_angle_constraint(segment_id, PI / 2.0)
+        } else {
+            self.add_segment_angle_constraint(segment_id, -PI / 2.0)
+        }
+    }
+
+    pub fn add_segment_horizontal_constraint(&mut self, segment_id: u64) -> u64 {
+        let current_angle = self.segment_angle(segment_id);
+        if current_angle.abs() <= PI / 2.0 {
+            // it roughly points right
+            self.add_segment_angle_constraint(segment_id, 0.0)
+        } else {
+            self.add_segment_angle_constraint(segment_id, PI)
+        }
+    }
+
+    pub fn add_segment_angle_constraint(&mut self, segment_id: u64, angle: f64) -> u64 {
+        let constraint = Constraint::SegmentAngle {
+            segment_id,
+            angle,
+            x_offset: 0.0,
+            y_offset: 0.0,
+            kp: 2.0,
+            kd: 0.3,
+            error: 0.0,
+        };
+
+        let id = self.highest_constraint_id + 1;
+        self.constraints.insert(id, constraint);
+        self.highest_constraint_id += 1;
+
+        let err = self.constraint_error(id);
+        let c = self.constraints.get_mut(&id).unwrap();
+        if let Constraint::SegmentAngle { error, .. } = c {
+            *error = err;
+        }
+
+        id
+    }
+
+    pub fn add_circle_diameter_constraint(&mut self, circle_id: u64, diameter: f64) -> u64 {
+        let constraint = Constraint::CircleDiameter {
+            circle_id,
+            diameter,
+            angle_offset: 3.0 * PI / 4.0,
+            r_offset: 0.20,
+            kp: 2.0,
+            kd: 0.3,
+            error: 0.0,
+        };
+
+        let id = self.highest_constraint_id + 1;
+        self.constraints.insert(id, constraint);
+        self.highest_constraint_id += 1;
+
+        let err = self.constraint_error(id);
+        let c = self.constraints.get_mut(&id).unwrap();
+        if let Constraint::CircleDiameter { error, .. } = c {
+            *error = err;
+        }
+
+        id
+    }
+
+    pub fn add_segments_equal_constraint(&mut self, segment_a_id: u64, segment_b_id: u64) -> u64 {
+        let constraint = Constraint::SegmentsEqual {
+            segment_a_id,
+            segment_b_id,
+            kp: 2.0,
+            kd: 0.3,
+            error: 0.0,
+        };
+
+        let id = self.highest_constraint_id + 1;
+        self.constraints.insert(id, constraint);
+        self.highest_constraint_id += 1;
+
+        let err = self.constraint_error(id);
+        let c = self.constraints.get_mut(&id).unwrap();
+        if let Constraint::SegmentsEqual { error, .. } = c {
+            *error = err;
+        }
+
+        id
+    }
+
+    pub fn compute_constraint_errors(&mut self) {
+        let key_to_errors = self
+            .constraints
+            .iter()
+            .map(|(k, _v)| (*k, self.constraint_error(*k)))
+            .collect::<HashMap<_, _>>();
+        for (constraint_id, err) in key_to_errors.iter() {
+            let constraint = self.constraints.get_mut(constraint_id).unwrap();
+            match constraint {
+                Constraint::SegmentLength { error, .. } => {
+                    *error = *err;
+                }
+                Constraint::CircleDiameter { error, .. } => {
+                    *error = *err;
+                }
+                Constraint::SegmentAngle { error, .. } => {
+                    *error = *err;
+                }
+                Constraint::SegmentsEqual { error, .. } => {
+                    *error = *err;
+                }
+            }
+        }
+    }
+
+    pub fn constraint_error(&self, constraint_id: u64) -> f64 {
+        let constraint = self.constraints.get(&constraint_id).unwrap();
+        let value = self.constraint_value(constraint_id);
+        match constraint {
+            Constraint::SegmentLength { length, .. } => value - length,
+            Constraint::CircleDiameter { diameter, .. } => value - diameter,
+            Constraint::SegmentAngle { angle, .. } => value - angle,
+            Constraint::SegmentsEqual { .. } => value,
+        }
+    }
+
+    pub fn constraint_value(&self, constraint_id: u64) -> f64 {
+        let constraint = self.constraints.get(&constraint_id).unwrap();
+        match constraint {
+            Constraint::SegmentLength {
+                segment_id, length, ..
+            } => {
+                let segment = self.line_segments.get(&segment_id).unwrap();
+                let start = self.points.get(&segment.start).unwrap();
+                let end = self.points.get(&segment.end).unwrap();
+                start.distance_to(end)
+            }
+
+            Constraint::CircleDiameter {
+                circle_id,
+                diameter,
+                ..
+            } => {
+                let circle = self.circles.get(&circle_id).unwrap();
+                circle.radius * 2.0
+            }
+
+            Constraint::SegmentAngle {
+                segment_id, angle, ..
+            } => {
+                let segment = self.line_segments.get(&segment_id).unwrap();
+                let start = self.points.get(&segment.start).unwrap();
+                let end = self.points.get(&segment.end).unwrap();
+                start.angle_to(end)
+            }
+
+            Constraint::SegmentsEqual {
+                segment_a_id,
+                segment_b_id,
+                ..
+            } => {
+                let a = self.segment_length(*segment_a_id);
+                let b = self.segment_length(*segment_b_id);
+                a - b
+            }
+        }
+    }
+
+    pub fn constraint_is_satisfied(&self, constraint_id: u64) -> bool {
+        let tolerance = 1e-10;
+        let constraint = self.constraints.get(&constraint_id).unwrap();
+        let error = self.constraint_error(constraint_id);
+        error.abs() < tolerance
+    }
+
+    pub fn all_constraints_are_satisfied(&self) -> bool {
+        for (constraint_id, _constraint) in self.constraints.iter() {
+            if !self.constraint_is_satisfied(*constraint_id) {
+                return false;
+            }
+        }
+        true
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::project::Project;
+
+    use super::*;
+
+    #[test]
+    fn segment_length_constraint() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+
+        let segment_id = sketch.add_segment(a, b);
+
+        let constraint_id = sketch.add_segment_length_constraint(segment_id, 2.0);
+
+        assert!(sketch.solve(1000));
+        println!("Segment length: {}", sketch.segment_length(segment_id));
+        assert!(sketch.constraint_is_satisfied(constraint_id));
+    }
+
+    #[test]
+    fn segment_angle_constraint() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+
+        let segment_id = sketch.add_segment(a, b);
+
+        let constraint_id = sketch.add_segment_angle_constraint(segment_id, PI / 4.0);
+
+        sketch.solve(10000);
+
+        assert!(sketch.constraint_is_satisfied(constraint_id));
+    }
+}
diff --git a/packages/cadmium/src/sketch/intersections.rs b/packages/cadmium/src/sketch/intersections.rs
new file mode 100644
index 00000000..7fe4b802
--- /dev/null
+++ b/packages/cadmium/src/sketch/intersections.rs
@@ -0,0 +1,1985 @@
+use std::{collections::VecDeque, f32::EPSILON};
+
+use crate::sketch::{Arc2, Circle2, IncrementingMap, Line2, Point2, Sketch};
+use itertools::Itertools;
+use std::f64::consts::{PI, TAU};
+
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Shape {
+    Circle(Circle2),
+    Arc(Arc2),
+    Line(Line2),
+}
+
+impl Shape {
+    pub fn split_at_point_id(&self, new_point_id: u64) -> (Shape, Shape) {
+        match self {
+            Shape::Line(line) => {
+                let new_line_1 = Line2 {
+                    start: line.start,
+                    end: new_point_id,
+                };
+                let new_line_2 = Line2 {
+                    start: new_point_id,
+                    end: line.end,
+                };
+                (Shape::Line(new_line_1), Shape::Line(new_line_2))
+            }
+            Shape::Circle(circle) => todo!(),
+            Shape::Arc(_) => todo!(),
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Collision {
+    point: Point2,
+    shape_a: u64,
+    shape_b: u64,
+    shape_a_degeneracy: Degeneracy,
+    shape_b_degeneracy: Degeneracy,
+}
+
+impl Collision {
+    pub fn new(point: Point2, shape_a: u64, shape_b: u64) -> Self {
+        Collision {
+            point,
+            shape_a,
+            shape_b,
+            shape_a_degeneracy: Degeneracy::None,
+            shape_b_degeneracy: Degeneracy::None,
+        }
+    }
+    pub fn degenerate(shape_a: u64, shape_b: u64) -> Self {
+        Collision {
+            point: Point2::new(f64::NAN, f64::NAN),
+            shape_a,
+            shape_b,
+            shape_a_degeneracy: Degeneracy::Complete,
+            shape_b_degeneracy: Degeneracy::Complete,
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Degeneracy {
+    None,
+    IsStart,
+    IsEnd,
+    Complete,
+}
+
+use Degeneracy::*;
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Intersection {
+    None,
+    OnePoint(Point2, bool),
+    TwoPoints(Point2, bool, Point2, bool),
+    Line(Point2, Point2),
+    Arc(Arc2),
+    Circle(Circle2),
+}
+
+impl Sketch {
+    pub fn identify_collisions(
+        &self,
+        temp_sketch: &Sketch,
+        all_shapes: &IncrementingMap<Shape>,
+        shape_a_id: u64,
+        shape_b_id: u64,
+        debug: bool,
+    ) -> Vec<Collision> {
+        let shape_a = all_shapes.items.get(&(shape_a_id)).unwrap();
+        let shape_b = all_shapes.items.get(&(shape_b_id)).unwrap();
+
+        if (debug) {
+            println!("Shape A ({}): {:?}", shape_a_id, shape_a);
+            println!("Shape B ({}): {:?}", shape_b_id, shape_b);
+        }
+
+        match (shape_a, shape_b) {
+            (Shape::Circle(circle_a), Shape::Circle(circle_b)) => {
+                temp_sketch.circle_circle_collisions(circle_a, shape_a_id, circle_b, shape_b_id)
+            }
+            (Shape::Circle(circle_a), Shape::Arc(arc_b)) => {
+                temp_sketch.circle_arc_collisions(circle_a, shape_a_id, arc_b, shape_b_id)
+            }
+            (Shape::Circle(circle_a), Shape::Line(line_b)) => {
+                temp_sketch.line_circle_collisions(line_b, shape_b_id, circle_a, shape_a_id)
+            }
+            (Shape::Arc(arc_a), Shape::Circle(circle_b)) => {
+                temp_sketch.circle_arc_collisions(circle_b, shape_b_id, arc_a, shape_a_id)
+            }
+            (Shape::Arc(arc_a), Shape::Arc(arc_b)) => {
+                temp_sketch.arc_arc_collisions(arc_a, shape_a_id, arc_b, shape_b_id)
+            }
+            (Shape::Arc(arc_a), Shape::Line(line_b)) => {
+                temp_sketch.line_arc_collisions(line_b, shape_b_id, arc_a, shape_a_id)
+            }
+            (Shape::Line(line_a), Shape::Circle(circle_b)) => {
+                temp_sketch.line_circle_collisions(line_a, shape_a_id, circle_b, shape_b_id)
+            }
+            (Shape::Line(line_a), Shape::Arc(arc_b)) => {
+                temp_sketch.line_arc_collisions(line_a, shape_a_id, arc_b, shape_b_id)
+            }
+            (Shape::Line(line_a), Shape::Line(line_b)) => {
+                temp_sketch.line_line_collisions(line_a, shape_a_id, line_b, shape_b_id, false)
+            }
+        }
+    }
+
+    pub fn process_collision(
+        &self,
+        temp_sketch: &mut Sketch,
+        all_shapes: &mut IncrementingMap<Shape>,
+        possible_shape_collisions: &mut Vec<u64>,
+        new_shapes: &mut Vec<u64>,
+        recently_deleted: &mut Vec<u64>,
+        collision: Collision,
+        debug: bool,
+    ) {
+        if (debug) {
+            println!("Processing collision: {:?}", collision);
+        }
+
+        let shape_a_id = collision.shape_a;
+        let shape_b_id = collision.shape_b;
+        let point = collision.point;
+
+        let shape_a = all_shapes.get_item(shape_a_id).unwrap().clone();
+        let shape_b = all_shapes.get_item(shape_b_id).unwrap().clone();
+
+        match (shape_a, shape_b) {
+            (Shape::Circle(circle_a), Shape::Circle(circle_b)) => {
+                let new_point_id = temp_sketch.add_point(point.x, point.y);
+
+                let arc_a = temp_sketch.split_circle_at_point(&circle_a, &new_point_id, &point);
+                let arc_b = temp_sketch.split_circle_at_point(&circle_b, &new_point_id, &point);
+
+                // this is a unique case. We're making substitutions here, not deleting or creating
+                all_shapes.items.insert(shape_a_id, Shape::Arc(arc_a));
+                all_shapes.items.insert(shape_b_id, Shape::Arc(arc_b));
+
+                if (debug) {
+                    println!("Replaced two circles with two arcs, keeping the same IDs");
+                }
+            }
+            (Shape::Circle(circle_a), Shape::Arc(arc_b)) => {
+                let new_point_id = temp_sketch.add_point(point.x, point.y);
+
+                // the circle can be converted to an arc
+                let arc_a = temp_sketch.split_circle_at_point(&circle_a, &new_point_id, &point);
+                // the arc must be split into two arcs
+                let (arc_b1, arc_b2) =
+                    temp_sketch.split_arc_at_point(&arc_b, &new_point_id, &point);
+
+                // the circle -> arc amounts to a substitution not a deletion + creation
+                all_shapes.items.insert(shape_a_id, Shape::Arc(arc_a));
+
+                // but the arc -> 2 arcs is a deletion + creation
+                let new_arc_b1_id = all_shapes.add_item(Shape::Arc(arc_b1));
+                new_shapes.push(new_arc_b1_id);
+                let new_arc_b2_id = all_shapes.add_item(Shape::Arc(arc_b2));
+                new_shapes.push(new_arc_b2_id);
+                recently_deleted.push(all_shapes.remove_item(shape_b_id));
+
+                if (debug) {
+                    println!("Replaced a circle with an arc ({})", shape_a_id);
+                    println!(
+                        "AND replaced an arc ({}) with 2 arcs ({}), ({})",
+                        shape_b_id, new_arc_b1_id, new_arc_b2_id
+                    );
+                }
+            }
+            (Shape::Circle(_), Shape::Line(_)) => todo!(),
+            (Shape::Arc(_), Shape::Circle(_)) => todo!(),
+            (Shape::Arc(arc_a), Shape::Arc(arc_b)) => {
+                let new_point_id = temp_sketch.add_point(point.x, point.y);
+
+                let (arc_a1, arc_a2) =
+                    temp_sketch.split_arc_at_point(&arc_a, &new_point_id, &point);
+                let (arc_b1, arc_b2) =
+                    temp_sketch.split_arc_at_point(&arc_b, &new_point_id, &point);
+
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_a1)));
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_a2)));
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_b1)));
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_b2)));
+
+                recently_deleted.push(all_shapes.remove_item(shape_a_id));
+                recently_deleted.push(all_shapes.remove_item(shape_b_id));
+
+                if (debug) {
+                    println!("replaced two arcs with four arcs");
+                    println!(
+                        "Replaced arc {} with arcs {} and {}",
+                        shape_a_id, new_shapes[0], new_shapes[1]
+                    );
+
+                    println!(
+                        "Replaced arc {} with arcs {} and {}",
+                        shape_b_id, new_shapes[2], new_shapes[3]
+                    );
+                }
+            }
+            (Shape::Arc(_), Shape::Line(_)) => todo!(),
+            (Shape::Line(line_a), Shape::Circle(circle_b)) => {
+                let new_point_id = temp_sketch.add_point(point.x, point.y);
+
+                let (line_a1, line_a2) =
+                    temp_sketch.split_line_at_point(&line_a, &new_point_id, &point);
+                let arc_b = temp_sketch.split_circle_at_point(&circle_b, &new_point_id, &point);
+
+                // convert the circle into an arc in place
+                all_shapes.items.insert(shape_b_id, Shape::Arc(arc_b));
+
+                // delete the old line and replace with two smaller lines
+                new_shapes.push(all_shapes.add_item(Shape::Line(line_a1)));
+                new_shapes.push(all_shapes.add_item(Shape::Line(line_a2)));
+                recently_deleted.push(all_shapes.remove_item(shape_a_id));
+
+                if (debug) {
+                    println!(
+                        "Broke line {} into {} and {}",
+                        shape_a_id, new_shapes[0], new_shapes[1]
+                    );
+                    println!("Replaced circle {} with arc in place", shape_b_id);
+                }
+            }
+            (Shape::Line(line_a), Shape::Arc(arc_b)) => {
+                let new_point_id = temp_sketch.add_point(point.x, point.y);
+
+                let (line_a1, line_a2) =
+                    temp_sketch.split_line_at_point(&line_a, &new_point_id, &point);
+                let (arc_b1, arc_b2) =
+                    temp_sketch.split_arc_at_point(&arc_b, &new_point_id, &point);
+
+                new_shapes.push(all_shapes.add_item(Shape::Line(line_a1)));
+                new_shapes.push(all_shapes.add_item(Shape::Line(line_a2)));
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_b1)));
+                new_shapes.push(all_shapes.add_item(Shape::Arc(arc_b2)));
+
+                recently_deleted.push(all_shapes.remove_item(shape_a_id));
+                recently_deleted.push(all_shapes.remove_item(shape_b_id));
+
+                if (debug) {
+                    println!(
+                        "Replaced line {} with {} and {}",
+                        recently_deleted[0], new_shapes[0], new_shapes[1]
+                    );
+                    println!(
+                        "Replaced arc {} with {} and {}",
+                        recently_deleted[1], new_shapes[2], new_shapes[3]
+                    );
+                }
+            }
+            (Shape::Line(line_a), Shape::Line(line_b)) => {
+                let collision_point_id =
+                    match (&collision.shape_a_degeneracy, &collision.shape_b_degeneracy) {
+                        (IsStart, None) => line_a.start,
+                        (IsEnd, None) => line_a.end,
+                        (None, IsStart) => line_b.start,
+                        (None, IsEnd) => line_b.end,
+                        (None, None) => temp_sketch.add_point(point.x, point.y),
+                        (Complete, Complete) => {
+                            if (debug) {
+                                println!("COMPLETE degeneracy found. Removing line {}", shape_b_id);
+                            }
+                            all_shapes.remove_item(shape_b_id);
+
+                            recently_deleted.push(shape_b_id);
+
+                            return;
+                        }
+                        (_, _) => {
+                            if (debug) {
+                                println!("One line continues the other. Nothing to be done!");
+                            }
+                            return;
+                        }
+                    };
+
+                if collision.shape_a_degeneracy == None {
+                    let (line_a1, line_a2) =
+                        temp_sketch.split_line_at_point(&line_a, &collision_point_id, &point);
+
+                    new_shapes.push(all_shapes.add_item(Shape::Line(line_a1)));
+                    new_shapes.push(all_shapes.add_item(Shape::Line(line_a2)));
+                    recently_deleted.push(all_shapes.remove_item(shape_a_id));
+                    if (debug) {
+                        println!(
+                            "Replaced line {} with lines {} and {}",
+                            shape_a_id, new_shapes[0], new_shapes[1]
+                        );
+                    }
+                }
+
+                if collision.shape_b_degeneracy == None {
+                    let (line_b1, line_b2) =
+                        temp_sketch.split_line_at_point(&line_b, &collision_point_id, &point);
+
+                    new_shapes.push(all_shapes.add_item(Shape::Line(line_b1)));
+                    new_shapes.push(all_shapes.add_item(Shape::Line(line_b2)));
+                    recently_deleted.push(all_shapes.remove_item(shape_b_id));
+                    if (debug) {
+                        println!(
+                            "Replaced line {} with lines {} and {}",
+                            shape_b_id,
+                            new_shapes[new_shapes.len() - 2],
+                            new_shapes[new_shapes.len() - 1]
+                        );
+                    }
+                }
+
+                if collision.shape_a_degeneracy == IsEnd || collision.shape_a_degeneracy == IsStart
+                {
+                    if !possible_shape_collisions.contains(&collision.shape_a) {
+                        possible_shape_collisions.push(collision.shape_a);
+                    }
+                }
+
+                if collision.shape_b_degeneracy == IsEnd || collision.shape_b_degeneracy == IsStart
+                {
+                    if !possible_shape_collisions.contains(&collision.shape_b) {
+                        possible_shape_collisions.push(collision.shape_b);
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn step_process(
+        &self,
+        temp_sketch: &mut Sketch,
+        all_shapes: &mut IncrementingMap<Shape>,
+        pairs_to_check: &mut VecDeque<(u64, u64)>,
+        collisions: &mut VecDeque<Collision>,
+        possible_shape_collisions: &mut Vec<u64>,
+        new_shapes: &mut Vec<u64>,
+        recently_deleted: &mut Vec<u64>,
+        debug: bool,
+    ) -> bool {
+        // the bool we return indicates whether any work was done
+
+        if (debug) {
+            println!("----- Okay let's process:");
+        }
+
+        if !recently_deleted.is_empty() {
+            println!("Something was recently deleted, let's fix it");
+            // any collisions with the old shape are simply deleted
+            let mut indices_to_delete: Vec<usize> = vec![];
+            for (i, c) in collisions.iter().enumerate() {
+                if recently_deleted.contains(&c.shape_a) {
+                    indices_to_delete.push(i);
+
+                    if !possible_shape_collisions.contains(&c.shape_b) {
+                        possible_shape_collisions.push(c.shape_b);
+                        println!("Pushed a possible shape collision against {}", c.shape_b);
+                    }
+                }
+
+                if recently_deleted.contains(&c.shape_b) {
+                    indices_to_delete.push(i);
+
+                    if !possible_shape_collisions.contains(&c.shape_a) {
+                        possible_shape_collisions.push(c.shape_a);
+                        println!("Pushed a possible shape collision against {}", c.shape_a);
+                    }
+                }
+            }
+            for i in indices_to_delete.iter().rev() {
+                collisions.remove(*i);
+            }
+            println!("I removed {} collisions", indices_to_delete.len());
+
+            // We also need to comb through pairs_to_check to remove anything that
+            // references these recently removed shape IDs
+            indices_to_delete.clear();
+            for (i, (shape_a_id, shape_b_id)) in pairs_to_check.iter().enumerate() {
+                let shape_a_deleted = recently_deleted.contains(shape_a_id);
+                let shape_b_deleted = recently_deleted.contains(shape_b_id);
+
+                if !shape_a_deleted && !shape_b_deleted {
+                    //nothing to do, move on
+                    continue;
+                }
+
+                if shape_a_deleted && !shape_b_deleted {
+                    // shape A was deleted but B wasn't, we we'll need to consider whether any of the
+                    // new shapes are colliding with shape B
+                    if !possible_shape_collisions.contains(shape_b_id) {
+                        possible_shape_collisions.push(*shape_b_id);
+                    }
+                } else if shape_b_deleted && !shape_a_deleted {
+                    if !possible_shape_collisions.contains(shape_a_id) {
+                        possible_shape_collisions.push(*shape_a_id);
+                    }
+                } else if shape_a_deleted && shape_b_deleted {
+                    panic!("I didn't think both shapes could be deleted at once!");
+                }
+                indices_to_delete.push(i);
+            }
+            for i in indices_to_delete.iter().rev() {
+                pairs_to_check.remove(*i);
+            }
+            println!("I removed {} pairs to check", indices_to_delete.len());
+
+            recently_deleted.clear();
+            return true;
+        }
+
+        if !possible_shape_collisions.is_empty() || !new_shapes.is_empty() {
+            if (debug) {
+                println!("Possible shape collisions + new shapes! Let's add some pairs to check");
+            }
+            for possible_shape_id in possible_shape_collisions.iter() {
+                for new_shape_id in new_shapes.iter() {
+                    pairs_to_check.push_front((*possible_shape_id, *new_shape_id));
+                }
+            }
+            possible_shape_collisions.clear();
+            new_shapes.clear();
+            return true;
+        }
+
+        if !collisions.is_empty() {
+            if (debug) {
+                println!("We have a collision to process");
+            }
+            let collision = collisions.pop_front().unwrap();
+            self.process_collision(
+                temp_sketch,
+                all_shapes,
+                possible_shape_collisions,
+                new_shapes,
+                recently_deleted,
+                collision,
+                debug,
+            );
+
+            return true;
+        }
+
+        if !pairs_to_check.is_empty() {
+            if (debug) {
+                println!("We have pairs to check!");
+            }
+            let (shape_a_id, shape_b_id) = pairs_to_check.pop_front().unwrap();
+
+            let new_collisions =
+                self.identify_collisions(temp_sketch, all_shapes, shape_a_id, shape_b_id, debug);
+
+            if (debug) {
+                println!("Adding {} collisions", new_collisions.len());
+            }
+            for c in new_collisions {
+                // println!("Adding a collision");
+                collisions.push_back(c);
+            }
+            return true;
+        }
+
+        if (debug) {
+            println!("There was nothing to do!\n");
+        }
+        return false;
+    }
+
+    pub fn split_intersections(&self, debug: bool) -> Self {
+        let mut temp_sketch = self.clone();
+
+        // set up the necessary data structures:
+        // First put all segments: Arcs, Lines, Circles into one big collection called all_shapes
+        let mut all_shapes: IncrementingMap<Shape> = IncrementingMap::new();
+        let line_ids: Vec<u64> = temp_sketch.line_segments.keys().cloned().sorted().collect();
+        for line_id in line_ids {
+            let line = temp_sketch.line_segments.get(&line_id).unwrap();
+            all_shapes.add_item(Shape::Line(line.clone()));
+        }
+        let circle_ids: Vec<u64> = temp_sketch.circles.keys().cloned().sorted().collect();
+        for circle_id in circle_ids {
+            let circle = temp_sketch.circles.get(&circle_id).unwrap();
+            all_shapes.add_item(Shape::Circle(circle.clone()));
+        }
+        let arc_ids: Vec<u64> = temp_sketch.arcs.keys().cloned().sorted().collect();
+        for arc_id in arc_ids {
+            let arc = temp_sketch.arcs.get(&arc_id).unwrap();
+            all_shapes.add_item(Shape::Arc(arc.clone()));
+        }
+
+        let mut pairs_to_check: VecDeque<(u64, u64)> = VecDeque::new();
+        let mut collisions: VecDeque<Collision> = VecDeque::new();
+        let mut possible_shape_collisions: Vec<u64> = vec![];
+        let mut new_shapes: Vec<u64> = vec![];
+        let mut recently_deleted: Vec<u64> = vec![];
+
+        // inject all the pairs of shapes that need to be checked:
+        for shape_id_a in all_shapes.items.keys() {
+            for shape_id_b in all_shapes.items.keys() {
+                if shape_id_a < shape_id_b {
+                    pairs_to_check.push_back((*shape_id_a, *shape_id_b))
+                }
+            }
+        }
+
+        // While there's anything to do, step the process forward
+        let mut count = 0;
+        loop {
+            if (debug) {
+                println!("\nstep: {} Here's the setup:", count);
+            }
+            count += 1;
+
+            if (debug) {
+                println!("Pairs to check: {:?}", pairs_to_check);
+                println!("Collisions: {:?}", collisions);
+                println!("Possible shape collisions: {:?}", possible_shape_collisions);
+                println!("New shapes: {:?}", new_shapes);
+                println!("Recently deleted: {:?}", recently_deleted);
+            }
+            // let mut input = String::new();
+            // io::stdin()
+            //     .read_line(&mut input)
+            //     .expect("error: unable to read user input");
+            // println!("{}", input);
+
+            let result = self.step_process(
+                &mut temp_sketch,
+                &mut all_shapes,
+                &mut pairs_to_check,
+                &mut collisions,
+                &mut possible_shape_collisions,
+                &mut new_shapes,
+                &mut recently_deleted,
+                debug,
+            );
+            // let mut input = String::new();
+            // io::stdin()
+            //     .read_line(&mut input)
+            //     .expect("error: unable to read user input");
+            // println!("{}", input);
+            if result == false {
+                break;
+            }
+        }
+
+        // Lastly, consolidate all the shapes into a final sketch and return it
+        let mut final_sketch = Sketch::new();
+        final_sketch.points = temp_sketch.points;
+        final_sketch.highest_point_id = temp_sketch.highest_point_id;
+        for shape in all_shapes.items.iter() {
+            match shape {
+                (id, Shape::Line(line)) => {
+                    final_sketch.add_segment(line.start, line.end);
+                }
+                (id, Shape::Circle(circle)) => {
+                    final_sketch.add_circle(circle.center, circle.radius);
+                }
+                (id, Shape::Arc(arc)) => {
+                    final_sketch.add_arc(arc.center, arc.start, arc.end, arc.clockwise);
+                }
+                _ => {}
+            }
+        }
+        if (debug) {
+            println!("So, in summary I've generated these shapes:");
+            for shape in all_shapes.items.iter() {
+                println!("{:?}", shape);
+            }
+        }
+        final_sketch
+    }
+
+    pub fn line_line_collisions(
+        &self,
+        line_a: &Line2,
+        line_a_id: u64,
+        line_b: &Line2,
+        line_b_id: u64,
+        debug: bool,
+    ) -> Vec<Collision> {
+        // catch the case where the lines are completely degenerate-their start and end points are the same
+        if line_a.start == line_b.start || line_a.start == line_b.end {
+            if line_a.end == line_b.start || line_a.end == line_b.end {
+                return vec![Collision::degenerate(line_a_id, line_b_id)];
+            }
+        }
+
+        let a_start = self.points.get(&line_a.start).unwrap();
+        let a_end = self.points.get(&line_a.end).unwrap();
+        let b_start = self.points.get(&line_b.start).unwrap();
+        let b_end = self.points.get(&line_b.end).unwrap();
+
+        fn normal_form(start: &Point2, end: &Point2) -> (f64, f64, f64) {
+            let a = start.y - end.y;
+            let b = end.x - start.x;
+            let c = (start.x - end.x) * start.y + (end.y - start.y) * start.x;
+            return (a, b, c);
+        }
+
+        let (a1, b1, c1) = normal_form(&a_start, &a_end);
+        let (a2, b2, c2) = normal_form(&b_start, &b_end);
+
+        if (debug) {
+            println!("a1, b1, c1: {} {} {}", a1, b1, c1);
+            println!("a2, b2, c2: {} {} {}", a2, b2, c2);
+        }
+
+        let x_intercept = (b1 * c2 - b2 * c1) / (a1 * b2 - a2 * b1);
+        let y_intercept = (c1 * a2 - c2 * a1) / (a1 * b2 - a2 * b1);
+
+        if (debug) {
+            println!("Intercept: {} {}", x_intercept, y_intercept);
+        }
+
+        if x_intercept.is_nan() || y_intercept.is_nan() {
+            // something degenerate happened. The lines may be parallel.
+            if (debug) {
+                println!("NAN intercept, so lines are be parallel");
+            }
+
+            let tol = 1e-8;
+            let a_start_colinear_with_b = (a2 * a_start.x + b2 * a_start.y + c2).abs() < tol;
+            let a_end_colinear_with_b = (a2 * a_end.x + b2 * a_end.y + c2).abs() < tol;
+
+            if a_start_colinear_with_b && a_end_colinear_with_b {
+                if (debug) {
+                    println!("The lines are perfectly colinear!");
+                }
+
+                let mut collisions: Vec<Collision> = vec![];
+
+                // it is possible these lines overlap somewhat.
+                if within_range(a_start.x, b_start.x, b_end.x, -tol)
+                    && within_range(a_start.y, b_start.y, b_end.y, -tol)
+                {
+                    // a_start is WITHIN b!
+                    if (debug) {
+                        println!("A start is within B");
+                    }
+                    let mut collision = Collision::new(a_start.clone(), line_a_id, line_b_id);
+                    collision.shape_a_degeneracy = IsStart;
+                    collisions.push(collision);
+                }
+                if within_range(a_end.x, b_start.x, b_end.x, -tol)
+                    && within_range(a_end.y, b_start.y, b_end.y, -tol)
+                {
+                    // a_end is WITHIN b!
+                    if (debug) {
+                        println!("A end is within B");
+                    }
+                    let mut collision = Collision::new(a_end.clone(), line_a_id, line_b_id);
+                    collision.shape_a_degeneracy = IsEnd;
+                    collisions.push(collision);
+                }
+
+                if within_range(b_start.x, a_start.x, a_end.x, -tol)
+                    && within_range(b_start.y, a_start.y, a_end.y, -tol)
+                {
+                    // b_start is WITHIN a!
+                    if (debug) {
+                        println!("B start is within A");
+                    }
+                    let mut collision = Collision::new(b_start.clone(), line_a_id, line_b_id);
+                    collision.shape_b_degeneracy = IsStart;
+                    collisions.push(collision);
+                }
+                if within_range(b_end.x, a_start.x, a_end.x, -tol)
+                    && within_range(b_end.y, a_start.y, a_end.y, -tol)
+                {
+                    // b_end is WITHIN a!
+                    if (debug) {
+                        println!("B end is within A");
+                    }
+                    let mut collision = Collision::new(b_end.clone(), line_a_id, line_b_id);
+                    collision.shape_b_degeneracy = IsEnd;
+                    collisions.push(collision);
+                }
+
+                return collisions;
+            } else {
+                // If the lines are parallel but not colinear, then they can have no collisions
+                return vec![];
+            }
+        }
+
+        if x_intercept.is_infinite() || y_intercept.is_infinite() {
+            if (debug) {
+                println!("Infinite intercept, so lines are parallel");
+            }
+            return vec![];
+        }
+
+        // it only counts as an intersection if it falls within both the segments
+        // Check that the x-intercept is within the x-range of the first segment
+        let epsilon = 1e-12;
+        if within_range(x_intercept, a_start.x, a_end.x, epsilon)
+            && within_range(y_intercept, a_start.y, a_end.y, epsilon)
+        {
+            if within_range(x_intercept, b_start.x, b_end.x, epsilon)
+                && within_range(y_intercept, b_start.y, b_end.y, epsilon)
+            {
+                let collision_point = Point2::new(x_intercept, y_intercept);
+                let mut collision = Collision::new(collision_point.clone(), line_a_id, line_b_id);
+                if points_almost_equal(&a_start, &collision_point) {
+                    collision.shape_a_degeneracy = Degeneracy::IsStart;
+                }
+                if points_almost_equal(&a_end, &collision_point) {
+                    collision.shape_a_degeneracy = Degeneracy::IsEnd;
+                }
+                if points_almost_equal(&b_start, &collision_point) {
+                    collision.shape_b_degeneracy = Degeneracy::IsStart;
+                }
+                if points_almost_equal(&b_end, &collision_point) {
+                    collision.shape_b_degeneracy = Degeneracy::IsEnd;
+                }
+                return vec![collision];
+            }
+        }
+
+        vec![]
+    }
+
+    pub fn line_arc_collisions(
+        &self,
+        line_a: &Line2,
+        line_a_id: u64,
+        arc_b: &Arc2,
+        arc_b_id: u64,
+    ) -> Vec<Collision> {
+        // treat this is circle/circle collision, then just do some checks
+        // afterwards to make sure the collision points really do fall within
+        // the bounds of the arc
+        println!("LINE AGAINST ARC");
+        let arc_center = self.points.get(&arc_b.center).unwrap();
+        // println!("Getting arc start: {}", &arc.start);
+        let arc_start = self.points.get(&arc_b.start).unwrap();
+        let arc_dx = arc_center.x - arc_start.x;
+        let arc_dy = arc_center.y - arc_start.y;
+        let arc_radius = arc_dx.hypot(arc_dy);
+        let fake_circle = Circle2 {
+            center: arc_b.center,
+            radius: arc_radius,
+            top: arc_b.start,
+        };
+
+        println!("Fake circle: {:?}", &fake_circle);
+        println!("Line Details:");
+        let line_start = &self.points[&line_a.start];
+        println!("start: {:?}", line_start);
+        let line_end = &self.points[&line_a.end];
+        println!("end: {:?}", line_end);
+
+        let fake_collisions =
+            self.line_circle_collisions(line_a, line_a_id, &fake_circle, arc_b_id);
+
+        println!("Fake collisions: {:?}", fake_collisions);
+
+        let mut real_collisions: Vec<Collision> = vec![];
+
+        for c in fake_collisions {
+            // check to make sure the point falls within the arc.
+            if self.point_within_arc(arc_b, &c.point) {
+                real_collisions.push(c);
+            }
+        }
+
+        real_collisions
+    }
+
+    pub fn line_circle_collisions(
+        &self,
+        line_a: &Line2,
+        line_a_id: u64,
+        circle_b: &Circle2,
+        circle_b_id: u64,
+    ) -> Vec<Collision> {
+        // to make the math easier, let's assume the circle's center point is the origin
+        // let's translate the line's start and end points
+        let mut start = self.points[&line_a.start].clone();
+        let mut end = self.points[&line_a.end].clone();
+        let center = self.points[&circle_b.center].clone();
+        let r = circle_b.radius;
+        println!("Radius as reported by circle: {}", r);
+        start.x -= center.x;
+        start.y -= center.y;
+        end.x -= center.x;
+        end.y -= center.y;
+
+        // get the line in normal form
+        let (a, b, c) = normal_form(&start, &end);
+
+        println!("Line from {:?} to {:?}", &start, &end);
+        println!("In normal form: {} {} {}", a, b, c);
+        let (mut y1, mut y2, mut x1, mut x2);
+
+        let dy = (end.y - start.y).abs();
+
+        if a == 0.0 || dy < 1e-10 {
+            println!("It's a horizontal line");
+            // oh, it's a horizontal line! that makes the math easier
+            y1 = -c / b;
+            y2 = -c / b;
+
+            println!("Y1 and Y2: {} {}", y1, y2);
+
+            x1 = (r * r - y1 * y1).sqrt();
+            x2 = -(r * r - y1 * y1).sqrt();
+
+            // println!("X1 and X2: {} {}", x1, x2);
+        } else {
+            println!("It's not a special case");
+            let det = a * a + b * b;
+            let d = (a * a * ((r * r * det) - c * c)).sqrt();
+
+            y1 = (-d - b * c) / det;
+            // println!("y1 {}", y1);
+            y2 = (d - b * c) / det;
+            // println!("y2 {}", y2);
+
+            x1 = -(b * y1 + c) / a;
+            // println!("x1 {}", x1);
+            x2 = -(b * y2 + c) / a;
+            // println!("x2 {}", x2);
+        }
+
+        println!("In shifted coordinates:");
+        println!("x1 y1 {} {}", x1, y1);
+        println!("x2 y2 {} {}", x2, y2);
+
+        if (x1.hypot(y1) - r).abs() > 1e-10 {
+            panic!(
+                "Somehow the radius is not equal! Got {} expected {}",
+                x1.hypot(y1),
+                r
+            );
+        }
+
+        if (x2.hypot(y2) - r).abs() > 1e-10 {
+            panic!(
+                "Somehow the radius is not equal! Got {} expected {}",
+                x2.hypot(y2),
+                r
+            );
+        }
+
+        y1 += center.y;
+        y2 += center.y;
+        x1 += center.x;
+        x2 += center.x;
+        start.x += center.x;
+        start.y += center.y;
+        end.x += center.x;
+        end.y += center.y;
+
+        println!("In real coordinates:");
+        println!("x1 y1 {} {}", x1, y1);
+        println!("x2 y2 {} {}", x2, y2);
+
+        // println!("X1 Y1: {} {}", x1, y1);
+        // println!("X2 Y2: {} {}", x2, y2);
+
+        let mut valid_collisions: Vec<Collision> = vec![];
+
+        let start = &self.points[&line_a.start];
+        let end = &self.points[&line_a.end];
+
+        let epsilon = 1e-10;
+
+        println!("Checking that X {} is within {} {}", x1, start.x, end.x);
+        println!("Checking that Y {} is within {} {}", y1, start.y, end.y);
+
+        if within_range(x1, start.x, end.x, epsilon) && within_range(y1, start.y, end.y, epsilon) {
+            println!("Added that point!");
+            valid_collisions.push(Collision::new(Point2::new(x1, y1), line_a_id, circle_b_id));
+        }
+
+        println!("Checking that X {} is within {} {}", x2, start.x, end.x);
+        println!("Checking that Y {} is within {} {}", y2, start.y, end.y);
+        if within_range(x2, start.x, end.x, epsilon) && within_range(y2, start.y, end.y, epsilon) {
+            println!("Added that point!");
+            valid_collisions.push(Collision::new(Point2::new(x2, y2), line_a_id, circle_b_id));
+        }
+
+        valid_collisions
+    }
+
+    pub fn circle_circle_collisions(
+        &self,
+        circle_a: &Circle2,
+        circle_a_id: u64,
+        circle_b: &Circle2,
+        circle_b_id: u64,
+    ) -> Vec<Collision> {
+        let center_a = self.points.get(&circle_a.center).unwrap();
+        let center_b = self.points.get(&circle_b.center).unwrap();
+        let r_a = circle_a.radius;
+        let r_b = circle_b.radius;
+
+        // compute distance between centers
+        let center_dx = center_b.x - center_a.x;
+        let center_dy = center_b.y - center_a.y;
+        let center_dist = center_dx.hypot(center_dy);
+
+        // if the circles are too far away OR too close, they don't intersect
+        if center_dist > r_a + r_b {
+            return vec![];
+        }
+        if center_dist < (r_a - r_b).abs() {
+            return vec![];
+        }
+
+        let epsilon = 1e-10;
+        if center_dist > r_a + r_b - epsilon && center_dist < r_a + r_b + epsilon {
+            // draw a straight line from a to b, of length r_a
+            let collision = Collision::new(
+                Point2::new(
+                    center_a.x + r_a * center_dx / center_dist,
+                    center_a.y + r_a * center_dy / center_dist,
+                ),
+                circle_a_id,
+                circle_b_id,
+            );
+            return vec![collision];
+        }
+
+        let r_2 = center_dist * center_dist;
+        let r_4 = r_2 * r_2;
+        let a = (r_a * r_a - r_b * r_b) / (2.0 * r_2);
+        let r_2_r_2 = r_a * r_a - r_b * r_b;
+        let c = (2.0 * (r_a * r_a + r_b * r_b) / r_2 - r_2_r_2 * r_2_r_2 / r_4 - 1.0).sqrt();
+
+        let fx = (center_a.x + center_b.x) / 2.0 + a * (center_b.x - center_a.x);
+        let gx = c * (center_b.y - center_a.y) / 2.0;
+        let ix1 = fx + gx;
+        let ix2 = fx - gx;
+
+        let fy = (center_a.y + center_b.y) / 2.0 + a * (center_b.y - center_a.y);
+        let gy = c * (center_a.x - center_b.x) / 2.0;
+        let iy1 = fy + gy;
+        let iy2 = fy - gy;
+
+        let collision_a = Collision::new(Point2::new(ix1, iy1), circle_a_id, circle_b_id);
+
+        let collision_b = Collision::new(Point2::new(ix2, iy2), circle_a_id, circle_b_id);
+
+        return vec![collision_a, collision_b];
+    }
+
+    pub fn circle_circle_intersection(
+        &self,
+        circle_a: &Circle2,
+        circle_b: &Circle2,
+    ) -> Intersection {
+        let center_a = self.points.get(&circle_a.center).unwrap();
+        let center_b = self.points.get(&circle_b.center).unwrap();
+        let r_a = circle_a.radius;
+        let r_b = circle_b.radius;
+
+        // compute distance between centers
+        let center_dx = center_b.x - center_a.x;
+        let center_dy = center_b.y - center_a.y;
+        let center_dist = center_dx.hypot(center_dy);
+
+        // if the circles are too far away OR too close, they don't intersect
+        if center_dist > r_a + r_b {
+            return Intersection::None;
+        }
+        if center_dist < (r_a - r_b).abs() {
+            return Intersection::None;
+        }
+
+        let r_2 = center_dist * center_dist;
+        let r_4 = r_2 * r_2;
+        let a = (r_a * r_a - r_b * r_b) / (2.0 * r_2);
+        let r_2_r_2 = r_a * r_a - r_b * r_b;
+        let c = (2.0 * (r_a * r_a + r_b * r_b) / r_2 - r_2_r_2 * r_2_r_2 / r_4 - 1.0).sqrt();
+
+        let fx = (center_a.x + center_b.x) / 2.0 + a * (center_b.x - center_a.x);
+        let gx = c * (center_b.y - center_a.y) / 2.0;
+        let ix1 = fx + gx;
+        let ix2 = fx - gx;
+
+        let fy = (center_a.y + center_b.y) / 2.0 + a * (center_b.y - center_a.y);
+        let gy = c * (center_a.x - center_b.x) / 2.0;
+        let iy1 = fy + gy;
+        let iy2 = fy - gy;
+
+        Intersection::TwoPoints(Point2::new(ix1, iy1), false, Point2::new(ix2, iy2), false)
+    }
+
+    pub fn circle_arc_collisions(
+        &self,
+        circle: &Circle2,
+        circle_id: u64,
+        arc: &Arc2,
+        arc_id: u64,
+    ) -> Vec<Collision> {
+        // treat this is circle/circle collision, then just do some checks
+        // afterwards to make sure the collision points really do fall within
+        // the bounds of the arc
+        let arc_center = self.points.get(&arc.center).unwrap();
+        // println!("Getting arc start: {}", &arc.start);
+        let arc_start = self.points.get(&arc.start).unwrap();
+        let arc_dx = arc_center.x - arc_start.x;
+        let arc_dy = arc_center.y - arc_start.y;
+        let arc_radius = arc_dx.hypot(arc_dy);
+        let fake_circle = Circle2 {
+            center: arc.center,
+            radius: arc_radius,
+            top: arc.start,
+        };
+
+        let fake_collisions: Vec<Collision> =
+            self.circle_circle_collisions(circle, circle_id, &fake_circle, arc_id);
+        println!("Fake collision: {:?}", fake_collisions);
+
+        let mut real_collisions: Vec<Collision> = vec![];
+
+        for c in fake_collisions {
+            // check to make sure the point falls within the arc.
+            if self.point_within_arc(arc, &c.point) {
+                real_collisions.push(c);
+            }
+        }
+
+        real_collisions
+    }
+
+    pub fn circle_arc_intersection(&self, circle: &Circle2, arc: &Arc2) -> Intersection {
+        // treat this is circle/circle intersection, then just do some checks
+        // afterwards to make sure the intersection points really do fall within
+        // the bounds of the arc
+        let arc_center = self.points.get(&arc.center).unwrap();
+        let arc_start = self.points.get(&arc.start).unwrap();
+        let arc_dx = arc_center.x - arc_start.x;
+        let arc_dy = arc_center.y - arc_start.y;
+        let arc_radius = arc_dx.hypot(arc_dy);
+        let fake_circle = Circle2 {
+            center: arc.center,
+            radius: arc_radius,
+            top: arc.start,
+        };
+
+        let fake_intersection = self.circle_circle_intersection(circle, &fake_circle);
+        println!("Fake intersection: {:?}", fake_intersection);
+
+        match fake_intersection {
+            Intersection::None => Intersection::None,
+            Intersection::OnePoint(_, _) => todo!(),
+            Intersection::TwoPoints(point_a, is_degenerate_a, point_b, is_degenerate_b) => {
+                // check to make sure that both points fall within the arc. If only one
+                // of them does, just return that one. if none do, return none.
+                // if both do, return both.
+                let point_a_good = self.point_within_arc(arc, &point_a);
+                let point_b_good = self.point_within_arc(arc, &point_b);
+
+                match (point_a_good, point_b_good) {
+                    (true, true) => {
+                        Intersection::TwoPoints(point_a, is_degenerate_a, point_b, is_degenerate_b)
+                    }
+                    (true, false) => Intersection::OnePoint(point_a, is_degenerate_a),
+                    (false, true) => Intersection::OnePoint(point_b, is_degenerate_b),
+                    (false, false) => Intersection::None,
+                }
+            }
+            Intersection::Line(_, _) => todo!(),
+            Intersection::Arc(_) => todo!(),
+            Intersection::Circle(_) => todo!(),
+        }
+    }
+
+    pub fn point_within_arc(&self, arc: &Arc2, point: &Point2) -> bool {
+        let center = self.points.get(&arc.center).unwrap();
+        let mut start = self.points.get(&arc.start).unwrap();
+        let mut end = self.points.get(&arc.end).unwrap();
+
+        // clockwise arcs are weird and unconventional. Within this function, pretend all arcs are CCW.
+        // doing this destroys 1 bit of information about the arc, but it's irrelevant for the purposes of this function
+        if arc.clockwise {
+            (start, end) = (end, start);
+        }
+
+        // cool, so you only have to imagine this math working for CCW arcs
+        let start_dx = start.x - center.x;
+        let start_dy = start.y - center.y;
+        let start_angle = start_dy.atan2(start_dx);
+
+        let end_dx = end.x - center.x;
+        let end_dy = end.y - center.y;
+        let mut end_angle = end_dy.atan2(end_dx);
+
+        if end_angle <= start_angle {
+            end_angle += TAU;
+        }
+
+        let point_dx = point.x - center.x;
+        let point_dy = point.y - center.y;
+        let mut point_angle = point_dy.atan2(point_dx);
+
+        if point_angle < start_angle {
+            point_angle += TAU;
+        }
+
+        if point_angle >= start_angle && point_angle <= end_angle {
+            // okay the angles work out, but we gotta run one last check:
+            // make sure the point is the right distance from center!
+            let arc_radius = start_dy.hypot(start_dx);
+            let point_radius = point_dy.hypot(point_dx);
+            let radius_diff = (arc_radius - point_radius).abs();
+
+            // floats are never really *equal*, just nearly equal
+            radius_diff < 1e-10
+        } else {
+            false
+        }
+    }
+
+    pub fn arc_arc_collisions(
+        &self,
+        arc_a: &Arc2,
+        arc_a_id: u64,
+        arc_b: &Arc2,
+        arc_b_id: u64,
+    ) -> Vec<Collision> {
+        // treat this is circle/circle collision, then just do some checks
+        // afterwards to make sure the collision points really do fall within
+        // the bounds of the arc
+        let arc_a_center = self.points.get(&arc_a.center).unwrap();
+        // println!("Getting arc start: {}", &arc.start);
+        let arc_a_start = self.points.get(&arc_a.start).unwrap();
+        let arc_a_end = self.points.get(&arc_a.end).unwrap();
+        let arc_a_dx = arc_a_center.x - arc_a_start.x;
+        let arc_a_dy = arc_a_center.y - arc_a_start.y;
+        let arc_a_radius = arc_a_dx.hypot(arc_a_dy);
+        let fake_circle_a = Circle2 {
+            center: arc_a.center,
+            radius: arc_a_radius,
+            top: arc_a.start,
+        };
+
+        let arc_b_center = self.points.get(&arc_b.center).unwrap();
+        // println!("Getting arc start: {}", &arc.start);
+        let arc_b_start = self.points.get(&arc_b.start).unwrap();
+        let arc_b_end = self.points.get(&arc_b.end).unwrap();
+        let arc_b_dx = arc_b_center.x - arc_b_start.x;
+        let arc_b_dy = arc_b_center.y - arc_b_start.y;
+        let arc_b_radius = arc_b_dx.hypot(arc_b_dy);
+        let fake_circle_b = Circle2 {
+            center: arc_b.center,
+            radius: arc_b_radius,
+            top: arc_b.start,
+        };
+
+        let mut forbidden_points: Vec<Point2> = vec![];
+        if arc_a.start == arc_b.start || arc_a.start == arc_b.end {
+            forbidden_points.push(arc_a_start.clone());
+        }
+        if arc_a.end == arc_b.end || arc_a.end == arc_b.start {
+            forbidden_points.push(arc_a_end.clone());
+        }
+
+        let fake_collisions: Vec<Collision> =
+            self.circle_circle_collisions(&fake_circle_a, arc_a_id, &fake_circle_b, arc_b_id);
+        println!("Fake collisions: {:?}", fake_collisions);
+
+        let mut real_collisions: Vec<Collision> = vec![];
+
+        for c in fake_collisions {
+            // check to make sure the point falls within both arcs.
+            if self.point_within_arc(arc_a, &c.point) && self.point_within_arc(arc_b, &c.point) {
+                // check to make sure the collision point is not approximately equal to any of
+                // the start or end points
+
+                let mut point_was_forbidden = false;
+                for forbidden_point in forbidden_points.iter() {
+                    if points_almost_equal(&c.point, forbidden_point) {
+                        point_was_forbidden = true;
+                        break;
+                    }
+                }
+
+                if !point_was_forbidden {
+                    real_collisions.push(c);
+                } else {
+                    println!("A point was forbidden! {:?}", &c.point);
+                }
+            }
+        }
+
+        real_collisions
+    }
+
+    pub fn split_circle_at_point(&self, circle: &Circle2, point_id: &u64, point: &Point2) -> Arc2 {
+        // this converts a single circle into a single arc
+        let new_arc = Arc2 {
+            center: circle.center,
+            start: *point_id,
+            end: *point_id,
+            clockwise: false,
+        };
+
+        new_arc
+    }
+
+    pub fn split_arc_at_point(&self, arc: &Arc2, point_id: &u64, point: &Point2) -> (Arc2, Arc2) {
+        // this converts a single arc into a two arcs
+        let new_arc_1 = Arc2 {
+            center: arc.center,
+            start: arc.start,
+            end: *point_id,
+            clockwise: arc.clockwise,
+        };
+
+        let new_arc_2 = Arc2 {
+            center: arc.center,
+            start: *point_id,
+            end: arc.end,
+            clockwise: arc.clockwise,
+        };
+
+        (new_arc_1, new_arc_2)
+    }
+
+    pub fn split_line_at_point(
+        &self,
+        line: &Line2,
+        point_id: &u64,
+        point: &Point2,
+    ) -> (Line2, Line2) {
+        let new_line_1 = Line2 {
+            start: line.start,
+            end: *point_id,
+        };
+
+        let new_line_2 = Line2 {
+            start: *point_id,
+            end: line.end,
+        };
+
+        (new_line_1, new_line_2)
+    }
+}
+
+pub fn points_almost_equal(point_a: &Point2, point_b: &Point2) -> bool {
+    let dx = (point_b.x - point_a.x).abs();
+    let dy = (point_b.y - point_a.y).abs();
+    dx < 1e-10 && dy < 1e-10
+}
+
+fn normal_form(start: &Point2, end: &Point2) -> (f64, f64, f64) {
+    // finds the normal form of a line:
+    // ax + by + c = 0
+    let a = start.y - end.y;
+    let b = end.x - start.x;
+    let c = (start.x - end.x) * start.y + (end.y - start.y) * start.x;
+    return (a, b, c);
+}
+
+fn within_range(x: f64, a: f64, b: f64, epsilon: f64) -> bool {
+    if a == b && b == x {
+        return true;
+    }
+    let mut retval;
+    if a < b {
+        retval = x >= a - epsilon && x <= b + epsilon;
+    } else {
+        retval = x >= b - epsilon && x <= a + epsilon;
+    }
+    retval
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::archetypes::Plane;
+    use crate::project::Project;
+    use crate::workbench::Workbench;
+
+    use super::*;
+
+    #[test]
+    fn line_through_rectangle() {
+        let contents =
+            std::fs::read_to_string("src/test_inputs/line_through_rectangle.cadmium").unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+        // println!("{:?}", p);
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+        println!("Sketch: {:?}", sketch_split);
+        println!("Faces: {:?}", sketch_split.faces);
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 2);
+    }
+
+    #[test]
+    fn line_through_many_rectangles() {
+        let contents =
+            std::fs::read_to_string("src/test_inputs/line_through_many_rectangles.cadmium")
+                .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+        // println!("{:?}", p);
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+        // println!("Sketch: {:?}", sketch_split);
+        // println!("Faces: {:?}", sketch_split.faces);
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 8);
+    }
+
+    #[test]
+    fn two_circles_two_intersections() {
+        // two intersecting circles should yield 3 extrudable faces
+        let contents = std::fs::read_to_string(
+            "src/test_inputs/sketches/circle_circle/two_circles_two_intersections.cadmium",
+        )
+        .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 3);
+    }
+
+    #[test]
+    fn four_circles() {
+        // three intersecting circles should yield 5 extrudable faces
+        let contents = std::fs::read_to_string(
+            "src/test_inputs/sketches/circle_circle/four_circles_chained.cadmium",
+        )
+        .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 7);
+    }
+
+    #[test]
+    fn three_circles() {
+        // three intersecting circles should yield 5 extrudable faces
+        let contents =
+            std::fs::read_to_string("src/test_inputs/sketches/circle_circle/three_circles.cadmium")
+                .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 5);
+    }
+
+    #[test]
+    fn circle_rectangle() {
+        // a circle that intersects with a rectangle on two lines
+        // let contents = std::fs::read_to_string(
+        //     "src/test_inputs/sketches/circle_line/circle_rectangle.cadmium",
+        // )
+        // .unwrap();
+        // let p: Project = serde_json::from_str(&contents).unwrap();
+
+        // let realized = p.get_realization(0, 1000);
+        // let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        // println!("Number of faces: {:?}", sketch_split.faces.len());
+        // assert_eq!(sketch_split.faces.len(), 3);
+
+        let contents = std::fs::read_to_string(
+            "src/test_inputs/sketches/circle_line/circle_rect_changing_size.cadmium",
+        )
+        .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 3);
+    }
+
+    #[test]
+    fn circle_quadrangle() {
+        // a circle that intersects with a rectangle on two lines
+        let contents = std::fs::read_to_string(
+            "src/test_inputs/sketches/circle_line/circle_quadrangle.cadmium",
+        )
+        .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 3);
+    }
+
+    #[test]
+    fn circle_rect_circle() {
+        // a circle that intersects with a rectangle on two lines
+        let contents = std::fs::read_to_string(
+            "src/test_inputs/sketches/circle_line/circle_rect_circle.cadmium",
+        )
+        .unwrap();
+        let p: Project = serde_json::from_str(&contents).unwrap();
+
+        let realized = p.get_realization(0, 1000);
+        let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+        println!("Number of faces: {:?}", sketch_split.faces.len());
+        assert_eq!(sketch_split.faces.len(), 5);
+    }
+
+    #[test]
+    fn points_are_in_arcs() {
+        let mut sketch = Sketch::new();
+
+        let origin = sketch.add_point(0.0, 0.0);
+        let right = sketch.add_point(1.0, 0.0);
+        let left = sketch.add_point(-1.0, 0.0);
+        let arc_top = Arc2 {
+            center: origin,
+            start: right,
+            end: left,
+            clockwise: false,
+        };
+        let arc_bottom = Arc2 {
+            center: origin,
+            start: left,
+            end: right,
+            clockwise: false,
+        };
+        let arc_top_cw = Arc2 {
+            center: origin,
+            start: left,
+            end: right,
+            clockwise: true,
+        };
+        let arc_bottom_cw = Arc2 {
+            center: origin,
+            start: right,
+            end: left,
+            clockwise: true,
+        };
+
+        let up_top = Point2::new(0.0, 1.0);
+        let down_low = Point2::new(0.0, -1.0);
+
+        // counterclockwise, as god intended
+        assert_eq!(sketch.point_within_arc(&arc_top, &up_top), true);
+        assert_eq!(sketch.point_within_arc(&arc_top, &down_low), false);
+
+        assert_eq!(sketch.point_within_arc(&arc_bottom, &up_top), false);
+        assert_eq!(sketch.point_within_arc(&arc_bottom, &down_low), true);
+
+        // clockwise, like a hooligan
+        assert_eq!(sketch.point_within_arc(&arc_top_cw, &up_top), true);
+        assert_eq!(sketch.point_within_arc(&arc_top_cw, &down_low), false);
+
+        assert_eq!(sketch.point_within_arc(&arc_bottom_cw, &up_top), false);
+        assert_eq!(sketch.point_within_arc(&arc_bottom_cw, &down_low), true);
+
+        let way_up_top = Point2::new(0.0, 100.0);
+        assert_eq!(sketch.point_within_arc(&arc_top, &way_up_top), false);
+    }
+
+    #[test]
+    fn circle_circle_collisions() {
+        let mut sketch = Sketch::new();
+
+        // two touching normally
+        println!("two circles touching normally at two points");
+        let a_radius = 1.0;
+        let a = sketch.add_point(0.0, 0.0);
+        let a_top = sketch.add_point(0.0, a_radius);
+        let b_radius = 1.0;
+        let b = sketch.add_point(1.0, 0.0);
+        let b_top = sketch.add_point(1.0, b_radius);
+        let circle_a = Circle2 {
+            center: a,
+            radius: a_radius,
+            top: a_top,
+        };
+        let circle_b = Circle2 {
+            center: b,
+            radius: b_radius,
+            top: b_top,
+        };
+        let collisions = sketch.circle_circle_collisions(&circle_a, 7, &circle_b, 8);
+        assert_eq!(
+            collisions,
+            vec![
+                Collision::new(Point2::new(0.5, -0.8660254037844386), 7, 8,),
+                Collision::new(Point2::new(0.5, 0.8660254037844386), 7, 8,)
+            ]
+        );
+
+        println!("Two circles touching at one point");
+        let a_radius = 2.0;
+        let a = sketch.add_point(0.0, 0.0);
+        let a_top = sketch.add_point(0.0, a_radius);
+        let b_radius = 3.0;
+        let b = sketch.add_point(a_radius + b_radius, 0.0);
+        let b_top = sketch.add_point(1.0, b_radius);
+        let circle_a = Circle2 {
+            center: a,
+            radius: a_radius,
+            top: a_top,
+        };
+        let circle_b = Circle2 {
+            center: b,
+            radius: b_radius,
+            top: b_top,
+        };
+        let collisions = sketch.circle_circle_collisions(&circle_a, 7, &circle_b, 8);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(Point2::new(2.0, 0.0), 7, 8,)]
+        );
+
+        println!("Two circles not touching--too far away");
+        let a_radius = 2.0;
+        let a = sketch.add_point(0.0, 0.0);
+        let a_top = sketch.add_point(0.0, a_radius);
+        let b_radius = 3.0;
+        let b = sketch.add_point(a_radius + b_radius + 1.0, 0.0);
+        let b_top = sketch.add_point(1.0, b_radius);
+        let circle_a = Circle2 {
+            center: a,
+            radius: a_radius,
+            top: a_top,
+        };
+        let circle_b = Circle2 {
+            center: b,
+            radius: b_radius,
+            top: b_top,
+        };
+        let collisions = sketch.circle_circle_collisions(&circle_a, 7, &circle_b, 8);
+        assert_eq!(collisions, vec![]);
+
+        println!("Two circles not touching--too close");
+        let a_radius = 2.0;
+        let a = sketch.add_point(0.0, 0.0);
+        let a_top = sketch.add_point(0.0, a_radius);
+        let b_radius = 3.0;
+        let b = sketch.add_point(0.5, 0.0);
+        let b_top = sketch.add_point(1.0, b_radius);
+        let circle_a = Circle2 {
+            center: a,
+            radius: a_radius,
+            top: a_top,
+        };
+        let circle_b = Circle2 {
+            center: b,
+            radius: b_radius,
+            top: b_top,
+        };
+        let collisions = sketch.circle_circle_collisions(&circle_a, 7, &circle_b, 8);
+        assert_eq!(collisions, vec![]);
+    }
+
+    #[test]
+    fn line_line_overlap_tests() {
+        let all_tests = [
+            [
+                /*
+                        |--------|
+                        |        |
+                |--------|        |
+                |        |        |
+                |        |--------|
+                |        |
+                |--------|
+                */
+                [0.0, 0.0],
+                [2.0, 0.0],
+                [2.0, 2.0],
+                [0.0, 2.0],
+
+                [2.0, 1.0],
+                [4.0, 1.0],
+                [4.0, 3.0],
+                [2.0, 3.0],
+
+                [2.0, 9.0]
+            ], [
+                /*
+                |--------|
+                |        |----|
+                |        |    |
+                |        |----|
+                |--------|
+                */
+                [0.0, 0.0],
+                [2.0, 0.0],
+                [2.0, 2.0],
+                [0.0, 2.0],
+
+                [2.0, 0.5],
+                [3.0, 0.5],
+                [3.0, 1.5],
+                [2.0, 1.5],
+
+                [2.0, 9.0]
+            ], [
+                /*
+                |--------|----|
+                |        |    |
+                |        |----|
+                |        |
+                |--------|
+                */
+                [0.0, 0.0],
+                [0.0, -2.0],
+                [2.0, -2.0],
+                [2.0, 0.0],
+
+                [3.0, 0.0],
+                [3.0, -1.0],
+                [2.0, -1.0],
+                [2.0, 0.0],
+
+                [2.0, 8.0]
+            ]
+        ];
+
+        for test in all_tests {
+            let mut p = Project::new("A");
+            let mut w = p.workbenches.get_mut(0).unwrap();
+
+            let top_plane_id = w.get_first_plane_id().unwrap();
+            let sketch_id = w.add_sketch_to_plane("Sketch 1", &top_plane_id);
+            let sketch = w.get_sketch_mut("Sketch 1").unwrap();
+
+            let a = sketch.add_point(test[0][0], test[0][1]);
+            let b = sketch.add_point(test[1][0], test[1][1]);
+            let c = sketch.add_point(test[2][0], test[2][1]);
+            let d = sketch.add_point(test[3][0], test[3][1]);
+
+            let e = sketch.add_point(test[4][0], test[4][1]);
+            let f = sketch.add_point(test[5][0], test[5][1]);
+            let g = sketch.add_point(test[6][0], test[6][1]);
+            let h = if test[7] == test[3] {
+                // For the last test, we want to make sure the line is closed
+                d.clone()
+            } else {
+                sketch.add_point(test[7][0], test[7][1])
+            };
+
+            // big one
+            sketch.add_segment(a, b);
+            sketch.add_segment(b, c);
+            sketch.add_segment(c, d);
+            sketch.add_segment(d, a);
+
+            // small one
+            sketch.add_segment(e, f);
+            sketch.add_segment(f, g);
+            sketch.add_segment(g, h);
+            sketch.add_segment(h, e);
+
+            let realized = p.get_realization(0, 1000);
+            let (sketch_unsplit, sketch_split, _) = realized.sketches.get("Sketch-0").unwrap();
+
+            println!("Number of faces: {:?}", sketch_split.faces.len());
+            assert_eq!(sketch_split.faces.len(), test[8][0] as usize);
+
+            assert_eq!(sketch_split.line_segments.len(), test[8][1] as usize);
+        }
+    }
+
+    #[test]
+    fn line_circle_collisions() {
+        let mut sketch = Sketch::new();
+
+        println!("simple crossing point horizontal line");
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(2.0, 0.0);
+        let c = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let circle_a = Circle2 {
+            center: a,
+            radius: 1.0,
+            top: c,
+        };
+        let collisions = sketch.line_circle_collisions(&line_ab, 1, &circle_a, 2);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(Point2::new(1.0, 0.0), 1, 2,)]
+        );
+
+        println!("simple crossing point horizontal line but backwards");
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(-2.0, 0.0);
+        let c = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let circle_a = Circle2 {
+            center: a,
+            radius: 1.0,
+            top: c,
+        };
+        let collisions = sketch.line_circle_collisions(&line_ab, 1, &circle_a, 2);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(Point2::new(-1.0, 0.0), 1, 2,)]
+        );
+
+        println!("simple crossing point 45 degree angle");
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(2.0, 2.0);
+        let c = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let circle_a = Circle2 {
+            center: a,
+            radius: 1.0,
+            top: c,
+        };
+        let collisions = sketch.line_circle_collisions(&line_ab, 1, &circle_a, 2);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(
+                Point2::new(0.7071067811865476, 0.7071067811865476), // sqrt(2)/2
+                1,
+                2,
+            )]
+        );
+
+        println!("simple crossing point 45 degree angle but away from origin");
+        let a = sketch.add_point(10.0, 10.0);
+        let b = sketch.add_point(12.0, 12.0);
+        let c = sketch.add_point(10.0, 11.0);
+        let line_ab = Line2 { start: a, end: b };
+        let circle_a = Circle2 {
+            center: a,
+            radius: 1.0,
+            top: c,
+        };
+        let collisions = sketch.line_circle_collisions(&line_ab, 1, &circle_a, 2);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(
+                Point2::new(10.7071067811865476, 10.7071067811865476),
+                1,
+                2,
+            )]
+        );
+
+        println!("simple crossing point vertical line");
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(0.0, 2.0);
+        let c = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let circle_a = Circle2 {
+            center: a,
+            radius: 1.0,
+            top: c,
+        };
+        let collisions = sketch.line_circle_collisions(&line_ab, 1, &circle_a, 2);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(Point2::new(0.0, 1.0), 1, 2,)]
+        );
+    }
+
+    #[test]
+    fn line_line_collisions() {
+        let mut sketch = Sketch::new();
+
+        // simple cross
+        println!("simple cross");
+        let a = sketch.add_point(-1.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(0.0, -1.0);
+        let d = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(
+            collisions,
+            vec![Collision::new(Point2::new(0.0, 0.0), 1, 2,)]
+        );
+
+        // a T
+        println!("an upside down T");
+        let a = sketch.add_point(-1.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(0.0, 0.0);
+        let d = sketch.add_point(0.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        let mut expected_collision = Collision::new(Point2::new(0.0, 0.0), 1, 2);
+        expected_collision.shape_b_degeneracy = IsStart;
+
+        // println!("Got this collision: {:?}", collisions[0]);
+        assert_eq!(collisions, vec![expected_collision]);
+
+        // parallel horizontal
+        println!("parallel horizontal");
+        let a = sketch.add_point(-1.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(-1.0, 1.0);
+        let d = sketch.add_point(1.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(collisions, vec![]);
+
+        // parallel vertical
+        println!("parallel vertical");
+        let a = sketch.add_point(0.0, -1.0);
+        let b = sketch.add_point(0.0, 1.0);
+        let c = sketch.add_point(1.0, -1.0);
+        let d = sketch.add_point(1.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(collisions, vec![]);
+
+        // perpendicular but not intersecting
+        println!("perpendicular but not intersecting");
+        let a = sketch.add_point(-1.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(3.0, 0.0);
+        let d = sketch.add_point(3.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(collisions, vec![]);
+
+        // share 1 point but only in the === sense not the == sense
+        println!("share 1 point but only in the === sense not the == sense");
+        let a = sketch.add_point(-1.0, 1.0);
+        let b = sketch.add_point(0.0, 0.0);
+        let c = sketch.add_point(0.0, 0.0);
+        let d = sketch.add_point(1.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        let mut expected_collision = Collision::new(Point2::new(0.0, 0.0), 1, 2);
+        expected_collision.shape_a_degeneracy = IsEnd;
+        expected_collision.shape_b_degeneracy = IsStart;
+        assert_eq!(collisions, vec![expected_collision]);
+
+        // share 1 point in the == sense
+        println!("share 1 point in the == sense");
+        let a = sketch.add_point(-1.0, 1.0);
+        let b = sketch.add_point(0.0, 0.0);
+        let d = sketch.add_point(1.0, 1.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: b, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        let mut expected_collision = Collision::new(Point2::new(0.0, 0.0), 1, 2);
+        expected_collision.shape_a_degeneracy = IsEnd;
+        expected_collision.shape_b_degeneracy = IsStart;
+        assert_eq!(collisions, vec![expected_collision]);
+
+        // colinear, horizontal no intersection
+        println!("colinear horizontal no intersection");
+        let a = sketch.add_point(-1.0, 0.0);
+        let b = sketch.add_point(0.0, 0.0);
+        let c = sketch.add_point(1.0, 0.0);
+        let d = sketch.add_point(2.0, 0.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(collisions, vec![]);
+
+        // colinear, vertical no intersection
+        println!("colinear vertical no intersection");
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(0.0, 1.0);
+        let c = sketch.add_point(0.0, 2.0);
+        let d = sketch.add_point(0.0, 3.0);
+        let line_ab = Line2 { start: a, end: b };
+        let line_cd = Line2 { start: c, end: d };
+        let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        assert_eq!(collisions, vec![]);
+
+        // Lines are exactly equal
+        // println!("Exactly equal");
+        // let a = sketch.add_point(0.0, 0.0);
+        // let b = sketch.add_point(0.0, 1.0);
+        // let line_ab = Line2 { start: a, end: b };
+        // let collisions = sketch.line_line_collisions(&line_ab, 1, &line_ab, 2, false);
+        // assert_eq!(
+        //     collisions,
+        //     Intersection::Line(Point2::new(0.0, 0.0), Point2::new(0.0, 1.0))
+        // );
+
+        // println!("\nLine Overlap:");
+        // // lines overlap somewhat, both vertical
+        // println!("lines overlap somewhat, both vertical");
+        // let a = sketch.add_point(0.0, 0.0);
+        // let b = sketch.add_point(0.0, 2.0);
+        // let c = sketch.add_point(0.0, 1.0);
+        // let d = sketch.add_point(0.0, 3.0);
+        // let line_ab = Line2 { start: a, end: b };
+        // let line_cd = Line2 { start: c, end: d };
+        // let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2, false);
+        // assert_eq!(
+        //     collisions,
+        //     Intersection::Line(Point2::new(0.0, 2.0), Point2::new(0.0, 1.0))
+        // );
+        // for future reference: the ordering of points here and for all of the tests below is inconsequential
+        // Feel free to swap the order here if the implementation changes. Maybe these should always come
+        // in a canonical order?
+
+        // lines overlap somewhat, both horizontal
+        // println!("lines overlap somewhat, both horizontal");
+        // let a = sketch.add_point(0.0, 0.0);
+        // let b = sketch.add_point(2.0, 0.0);
+        // let c = sketch.add_point(1.0, 0.0);
+        // let d = sketch.add_point(3.0, 0.0);
+        // let line_ab = Line2 { start: a, end: b };
+        // let line_cd = Line2 { start: c, end: d };
+        // let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2);
+        // assert_eq!(
+        //     collisions,
+        //     Intersection::Line(Point2::new(2.0, 0.0), Point2::new(1.0, 0.0))
+        // );
+
+        // // lines overlap somewhat, both angled
+        // println!("lines overlap somewhat, both angled");
+        // let a = sketch.add_point(0.0, 0.0);
+        // let b = sketch.add_point(2.0, 2.0);
+        // let c = sketch.add_point(1.0, 1.0);
+        // let d = sketch.add_point(3.0, 3.0);
+        // let line_ab = Line2 { start: a, end: b };
+        // let line_cd = Line2 { start: c, end: d };
+        // let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2);
+        // assert_eq!(
+        //     collisions,
+        //     Intersection::Line(Point2::new(2.0, 2.0), Point2::new(1.0, 1.0))
+        // );
+
+        // one line engulfs the other, both angled
+        // println!("one line engulfs the other, both angled");
+        // let a = sketch.add_point(1.0, 1.0);
+        // let b = sketch.add_point(2.0, 2.0);
+        // let c = sketch.add_point(0.0, 0.0);
+        // let d = sketch.add_point(3.0, 3.0);
+        // let line_ab = Line2 { start: a, end: b };
+        // let line_cd = Line2 { start: c, end: d };
+        // let collisions = sketch.line_line_collisions(&line_ab, 1, &line_cd, 2);
+        // assert_eq!(
+        //     collisions,
+        //     Intersection::Line(Point2::new(1.0, 1.0), Point2::new(2.0, 2.0))
+        // );
+    }
+}
diff --git a/packages/cadmium/src/sketch/mod.rs b/packages/cadmium/src/sketch/mod.rs
new file mode 100644
index 00000000..84f733e3
--- /dev/null
+++ b/packages/cadmium/src/sketch/mod.rs
@@ -0,0 +1,1911 @@
+#![allow(unused)]
+use geo::line_intersection::{line_intersection, LineIntersection};
+use geo::Line;
+use geo::{point, Contains};
+use geo::{within, Intersects};
+use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, DisplayFromStr};
+use truck_polymesh::stl::PolygonMeshStlFaceIterator;
+use tsify::Tsify;
+
+use core::panic;
+use geo::LineString;
+use geo::Polygon;
+use indexmap::IndexMap;
+use itertools::Itertools;
+use std::collections::hash_map::DefaultHasher;
+use std::collections::{HashMap, HashSet, VecDeque};
+use std::f64::consts::{PI, TAU};
+use std::hash::{Hash, Hasher};
+
+use crate::archetypes::{Circle3, Plane};
+use crate::error::CADmiumError;
+use crate::project::{Project, RealSketch};
+
+pub(crate) mod constraints;
+mod intersections;
+mod svg;
+
+use crate::sketch::constraints::Constraint;
+
+#[derive(strum::Display, Debug, Serialize, Deserialize)]
+pub enum SketchFeatureType {
+    Point,
+    Line,
+    Circle,
+    Arc,
+    Constraint,
+}
+
+#[serde_as]
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Sketch {
+    #[serde_as(as = "HashMap<DisplayFromStr, _>")]
+    pub points: HashMap<u64, Point2>,
+    pub highest_point_id: u64,
+
+    #[serde_as(as = "HashMap<DisplayFromStr, _>")]
+    pub line_segments: HashMap<u64, Line2>,
+    pub highest_line_segment_id: u64,
+
+    #[serde_as(as = "HashMap<DisplayFromStr, _>")]
+    pub circles: HashMap<u64, Circle2>,
+    pub highest_circle_id: u64,
+
+    #[serde_as(as = "HashMap<DisplayFromStr, _>")]
+    pub arcs: HashMap<u64, Arc2>,
+    pub highest_arc_id: u64,
+
+    #[serde_as(as = "HashMap<DisplayFromStr, _>")]
+    pub constraints: HashMap<u64, Constraint>,
+    pub highest_constraint_id: u64,
+}
+
+impl Sketch {
+    pub fn new() -> Self {
+        Sketch {
+            points: HashMap::new(),
+            highest_point_id: 0,
+            line_segments: HashMap::new(),
+            highest_line_segment_id: 0,
+            circles: HashMap::new(),
+            highest_circle_id: 0,
+            arcs: HashMap::new(),
+            highest_arc_id: 0,
+            constraints: HashMap::new(),
+            highest_constraint_id: 0,
+        }
+    }
+
+    pub fn from_faces(faces: &Vec<Face>, real_sketch: &RealSketch) -> Self {
+        let mut new_sketch = Sketch::new();
+
+        // println!("Creating a sketch just from faces");
+        // for face in faces {
+        //     println!("Face: {:?}", face);
+        // }
+
+        new_sketch.points = real_sketch.points_2d.clone();
+
+        let mut circles: HashMap<String, Circle2> = HashMap::new();
+        let mut line_segments: HashMap<String, Line2> = HashMap::new();
+        let mut arcs: HashMap<String, Arc2> = HashMap::new();
+
+        fn include_ring(
+            ring: &Ring,
+            circles: &mut HashMap<String, Circle2>,
+            line_segments: &mut HashMap<String, Line2>,
+            arcs: &mut HashMap<String, Arc2>,
+        ) {
+            match ring {
+                Ring::Circle(circle) => {
+                    let cs = circle.canonical_string();
+                    let search_result = circles.get(&cs);
+                    match search_result {
+                        Some(existing_circle) => {
+                            circles.remove(&cs);
+                        }
+                        None => {
+                            circles.insert(cs.clone(), circle.clone());
+                        }
+                    }
+                }
+                Ring::Segments(segments) => {
+                    for segment in segments {
+                        match segment {
+                            Segment::Line(line) => {
+                                let cs = line.canonical_string();
+                                let search_result = line_segments.get(&cs);
+
+                                match search_result {
+                                    Some(existing_line) => {
+                                        line_segments.remove(&cs);
+                                    }
+                                    None => {
+                                        line_segments.insert(cs.clone(), line.clone());
+                                    }
+                                }
+                            }
+                            Segment::Arc(arc) => {
+                                let cs = arc.canonical_string();
+                                let search_result = arcs.get(&cs);
+
+                                match search_result {
+                                    Some(existing_arc) => {
+                                        arcs.remove(&cs);
+                                    }
+                                    None => {
+                                        arcs.insert(cs.clone(), arc.clone());
+                                    }
+                                }
+                            }
+                            _ => {}
+                        }
+                    }
+                }
+            }
+        }
+
+        for face in faces {
+            include_ring(&face.exterior, &mut circles, &mut line_segments, &mut arcs);
+            for ring in &face.holes {
+                include_ring(ring, &mut circles, &mut line_segments, &mut arcs)
+            }
+        }
+
+        for (index, circle) in circles.values().enumerate() {
+            new_sketch.circles.insert(index as u64, circle.clone());
+        }
+
+        for (index, line) in line_segments.values().enumerate() {
+            new_sketch.line_segments.insert(index as u64, line.clone());
+        }
+
+        for (index, arc) in arcs.values().enumerate() {
+            new_sketch.arcs.insert(index as u64, arc.clone());
+        }
+
+        new_sketch
+    }
+
+    pub fn arc_angle(&self, arc: &Arc2) -> f64 {
+        let center = self.points.get(&arc.center).unwrap();
+        let start = self.points.get(&arc.start).unwrap();
+        let end = self.points.get(&arc.end).unwrap();
+
+        match arc.clockwise {
+            false => angle(start, center, end),
+            true => TAU - angle(start, center, end),
+        }
+    }
+
+    pub fn arc_end_angle(&self, arc: &Arc2) -> f64 {
+        let center = self.points.get(&arc.center).unwrap();
+        let end = self.points.get(&arc.end).unwrap();
+
+        let dx = end.x - center.x;
+        let dy = end.y - center.y;
+
+        if arc.clockwise {
+            dy.atan2(dx) - PI / 2.0
+        } else {
+            dy.atan2(dx) + PI / 2.0
+        }
+    }
+
+    pub fn arc_start_angle(&self, arc: &Arc2) -> f64 {
+        let center = self.points.get(&arc.center).unwrap();
+        let start = self.points.get(&arc.start).unwrap();
+
+        let dx = start.x - center.x;
+        let dy = start.y - center.y;
+
+        if arc.clockwise {
+            dy.atan2(dx) - PI / 2.0
+        } else {
+            dy.atan2(dx) + PI / 2.0
+        }
+    }
+
+    pub fn line_start_angle(&self, line: &Line2) -> f64 {
+        let start = self.points.get(&line.start).unwrap();
+        let end = self.points.get(&line.end).unwrap();
+
+        let dx = end.x - start.x;
+        let dy = end.y - start.y;
+
+        dy.atan2(dx)
+    }
+
+    pub fn line_end_angle(&self, line: &Line2) -> f64 {
+        self.line_start_angle(line)
+    }
+
+    pub fn pretty_print_arc(&self, arc: &Arc2) {
+        let center = self.points.get(&arc.center).unwrap();
+        let start = self.points.get(&arc.start).unwrap();
+        let end = self.points.get(&arc.end).unwrap();
+
+        println!(
+            "Arc: center: {}: ({}, {}), start: {}: ({}, {}), end: {}: ({}, {}) CW: {}",
+            arc.center,
+            center.x,
+            center.y,
+            arc.start,
+            start.x,
+            start.y,
+            arc.end,
+            end.x,
+            end.y,
+            arc.clockwise
+        );
+        println!("Start angle:\t{}", self.arc_start_angle(arc) * 180.0 / PI);
+        println!("End angle:  \t{}", self.arc_end_angle(arc) * 180.0 / PI);
+        println!("Angle:      \t{}", self.arc_angle(arc) * 180.0 / PI);
+    }
+
+    pub fn face_as_polygon(&self, face: &Face) -> Polygon {
+        let binding = self.as_polygon(&face.exterior);
+        let exterior = binding.exterior();
+
+        let mut interiors: Vec<LineString<f64>> = vec![];
+        for ring in &face.holes {
+            interiors.push(self.as_polygon(ring).exterior().clone());
+        }
+
+        Polygon::new(exterior.clone(), interiors)
+    }
+
+    pub fn as_polygon(&self, ring: &Ring) -> Polygon {
+        match ring {
+            Ring::Circle(circle) => {
+                let mut b: Vec<(f64, f64)> = vec![];
+                let center = self.points.get(&circle.center).unwrap();
+
+                let num_pts = 36;
+                for i in 0..num_pts {
+                    let angle = i as f64 / num_pts as f64 * TAU;
+                    let x = center.x + circle.radius * angle.cos();
+                    let y = center.y + circle.radius * angle.sin();
+                    b.push((x, y));
+                }
+
+                let polygon = Polygon::new(LineString::from(b), vec![]);
+                polygon
+            }
+            Ring::Segments(segments) => {
+                let mut b: Vec<(f64, f64)> = vec![];
+                for segment in segments {
+                    match segment {
+                        Segment::Line(line) => {
+                            // we only ever push the start point. Imagine what happens for a closed
+                            // square--the final closing segment is inferred.
+                            let start = self.points.get(&segment.get_start()).unwrap();
+                            b.push((start.x, start.y));
+                        }
+                        Segment::Arc(arc) => {
+                            // similarly, we push all the points except the final one. The final
+                            // segment is inferred.
+                            let points = self.arc_to_points(arc);
+                            for point in points {
+                                b.push((point.x, point.y));
+                            }
+                            b.pop();
+                        }
+                    }
+                }
+                let polygon = Polygon::new(LineString::from(b), vec![]);
+                polygon
+            }
+        }
+    }
+
+    pub fn arc_to_points(&self, arc: &Arc2) -> Vec<Point2> {
+        // println!("An arc to points: {:?}", arc);
+        let center = self.points.get(&arc.center).unwrap();
+        let start = self.points.get(&arc.start).unwrap();
+        let end = self.points.get(&arc.end).unwrap();
+        let clockwise = arc.clockwise;
+
+        arc_to_points(start, end, center, clockwise)
+    }
+
+    pub fn signed_area(&self, ring: &Ring) -> f64 {
+        match ring {
+            Ring::Circle(circle) => circle.radius * circle.radius * std::f64::consts::PI,
+            Ring::Segments(segments) => {
+                let mut area: f64 = 0.0;
+
+                for segment in segments {
+                    match segment {
+                        Segment::Line(line) => {
+                            let end = self.points.get(&segment.get_end()).unwrap();
+                            let start = self.points.get(&segment.get_start()).unwrap();
+                            area += (end.x - start.x) * (end.y + start.y);
+                        }
+                        Segment::Arc(arc) => {
+                            let points = self.arc_to_points(arc);
+                            for i in 0..points.len() - 1 {
+                                let end = &points[i + 1];
+                                let start = &points[i];
+                                area += (end.x - start.x) * (end.y + start.y);
+                            }
+                        }
+                    }
+                }
+                return area / -2.0;
+            }
+        }
+    }
+
+    pub fn add_point(&mut self, x: f64, y: f64) -> u64 {
+        let id = self.highest_point_id + 1;
+        self.points.insert(id, Point2::new(x, y));
+        self.highest_point_id += 1;
+        id
+    }
+
+    pub fn add_hidden_point(&mut self, x: f64, y: f64) -> u64 {
+        let id = self.highest_point_id + 1;
+        self.points.insert(id, Point2::new_hidden(x, y));
+        self.highest_point_id += 1;
+        id
+    }
+
+    pub fn add_point_with_id(&mut self, x: f64, y: f64, id0: u64) -> Result<(), CADmiumError> {
+        if self.points.contains_key(&id0) {
+            return Err(CADmiumError::SketchFeatureAlreadyExists(
+                SketchFeatureType::Point,
+                id0,
+            ));
+        }
+        if self.highest_point_id >= id0 {
+            return Err(CADmiumError::SketchFeatureIDTooLow(
+                SketchFeatureType::Point,
+                id0,
+            ));
+        }
+        self.points.insert(id0, Point2::new(x, y));
+        self.highest_point_id = id0;
+        Ok(())
+    }
+
+    pub fn add_fixed_point(&mut self, x: f64, y: f64) -> u64 {
+        let id = self.highest_point_id + 1;
+        self.points.insert(id, Point2::new_fixed(x, y));
+        self.highest_point_id += 1;
+        id
+    }
+
+    pub fn add_arc(&mut self, center_id: u64, start_id: u64, end_id: u64, clockwise: bool) -> u64 {
+        let a = Arc2 {
+            center: center_id,
+            start: start_id,
+            end: end_id,
+            clockwise,
+        };
+        let id = self.highest_arc_id + 1;
+        self.arcs.insert(id, a);
+        self.highest_arc_id += 1;
+        id
+    }
+
+    pub fn add_circle(&mut self, point_id: u64, radius: f64) -> u64 {
+        let center_pt = self.points.get(&point_id).unwrap();
+        let top = self.add_point(center_pt.x, center_pt.y + radius);
+        let top_point = self.points.get_mut(&top).unwrap();
+        top_point.hidden = true; // sneaky!
+        let c = Circle2 {
+            center: point_id,
+            radius,
+            top,
+        };
+        let id = self.highest_circle_id + 1;
+        self.circles.insert(id, c);
+        self.highest_circle_id += 1;
+        id
+    }
+
+    pub fn add_circle_between_points(&mut self, center_id: u64, edge_id: u64) -> u64 {
+        let center_pt = self.points.get(&center_id).unwrap();
+        let edge_pt = self.points.get(&edge_id).unwrap();
+        let radius = center_pt.distance_to(edge_pt);
+        let c = Circle2 {
+            center: center_id,
+            radius,
+            top: edge_id,
+        };
+        let id = self.highest_circle_id + 1;
+        self.circles.insert(id, c);
+        self.highest_circle_id += 1;
+        id
+    }
+
+    pub fn add_rectangle_between_points(
+        &mut self,
+        start_id: u64,
+        end_id: u64,
+    ) -> (Vec<u64>, Vec<u64>) {
+        let start = self.points.get(&start_id).unwrap();
+        let end = self.points.get(&end_id).unwrap();
+
+        let dx = end.x - start.x;
+        let dy = end.y - start.y;
+
+        let mut points = vec![];
+        let mut segments = vec![];
+
+        // create the two missing points
+        let p0 = {
+            let start_point = self.points.get(&start_id).unwrap();
+            self.add_point(start_point.x + dx, start_point.y)
+        };
+        let p1 = {
+            let start_point = self.points.get(&start_id).unwrap();
+            self.add_point(start_point.x, start_point.y + dy)
+        };
+
+        points.push(p0);
+        points.push(p1);
+
+        let s0 = self.add_segment(start_id, p1);
+        let s1 = self.add_segment(p1, end_id);
+        let s2 = self.add_segment(end_id, p0);
+        let s3 = self.add_segment(p0, start_id);
+
+        segments.push(s0);
+        segments.push(s1);
+        segments.push(s2);
+        segments.push(s3);
+
+        (points, segments)
+    }
+
+    pub fn add_segment(&mut self, id0: u64, id1: u64) -> u64 {
+        let l = Line2 {
+            start: id0,
+            end: id1,
+        };
+        let id = self.highest_line_segment_id + 1;
+        self.line_segments.insert(id, l);
+        self.highest_line_segment_id += 1;
+        id
+    }
+
+    pub fn add_line_segment(&mut self, x0: f64, y0: f64, x1: f64, y1: f64) -> u64 {
+        let id0 = self.add_point(x0, y0);
+        let id1 = self.add_point(x1, y1);
+        let l = Line2 {
+            start: id0,
+            end: id1,
+        };
+        let id = self.highest_line_segment_id + 1;
+        self.line_segments.insert(id, l);
+        self.highest_line_segment_id += 1;
+        id
+    }
+
+    pub fn delete_circle(&mut self, id: u64) {
+        let center_point_id = self.circles.get(&id).unwrap().center;
+        let top_point_id = self.circles.get(&id).unwrap().top;
+        let mut center_is_safe = false;
+        let mut top_is_safe = false;
+
+        for (line_id, line) in self.line_segments.iter() {
+            if line.start == center_point_id || line.end == center_point_id {
+                center_is_safe = true;
+            }
+            if line.start == top_point_id || line.end == top_point_id {
+                top_is_safe = true;
+            }
+        }
+
+        for (arc_id, arc) in self.arcs.iter() {
+            if arc.start == center_point_id
+                || arc.end == center_point_id
+                || arc.center == center_point_id
+            {
+                center_is_safe = true;
+            }
+            if arc.start == top_point_id || arc.end == top_point_id || arc.center == top_point_id {
+                top_is_safe = true;
+            }
+        }
+
+        for (circle_id, circle) in self.circles.iter() {
+            if *circle_id != id {
+                if circle.center == center_point_id || circle.top == center_point_id {
+                    center_is_safe = true;
+                }
+                if circle.center == top_point_id || circle.top == top_point_id {
+                    top_is_safe = true;
+                }
+            }
+        }
+
+        if !center_is_safe {
+            self.points.remove(&center_point_id);
+        }
+        if !top_is_safe {
+            self.points.remove(&top_point_id);
+        }
+
+        self.circles.remove(&id);
+    }
+
+    pub fn delete_arc(&mut self, id: u64) {
+        // TODO: return a result instead of crashing if the arc doesn't exist
+        // TODO: remove any constraints that reference this arc
+        let start_point_id = self.arcs.get(&id).unwrap().start;
+        let end_point_id = self.arcs.get(&id).unwrap().end;
+        let center_point_id = self.arcs.get(&id).unwrap().center;
+        let mut start_is_safe = false;
+        let mut end_is_safe = false;
+        let mut center_is_safe = false;
+
+        for (line_id, line) in self.line_segments.iter() {
+            if line.start == start_point_id || line.end == start_point_id {
+                start_is_safe = true;
+            }
+            if line.start == end_point_id || line.end == end_point_id {
+                end_is_safe = true;
+            }
+            if line.start == center_point_id || line.end == center_point_id {
+                center_is_safe = true;
+            }
+        }
+        for (arc_id, arc) in self.arcs.iter() {
+            if (*arc_id != id) {
+                if arc.start == start_point_id
+                    || arc.end == start_point_id
+                    || arc.center == start_point_id
+                {
+                    start_is_safe = true;
+                }
+                if arc.start == end_point_id
+                    || arc.end == end_point_id
+                    || arc.center == end_point_id
+                {
+                    end_is_safe = true;
+                }
+                if arc.start == center_point_id
+                    || arc.end == center_point_id
+                    || arc.center == center_point_id
+                {
+                    center_is_safe = true;
+                }
+            }
+        }
+        for (circle_id, circle) in self.circles.iter() {
+            if circle.center == start_point_id || circle.top == start_point_id {
+                start_is_safe = true;
+            }
+            if circle.center == end_point_id || circle.top == end_point_id {
+                end_is_safe = true;
+            }
+            if circle.center == center_point_id || circle.top == center_point_id {
+                center_is_safe = true;
+            }
+        }
+        if !start_is_safe {
+            self.points.remove(&start_point_id);
+        }
+        if !end_is_safe {
+            self.points.remove(&end_point_id);
+        }
+        if !center_is_safe {
+            self.points.remove(&center_point_id);
+        }
+
+        self.arcs.remove(&id);
+    }
+
+    pub fn delete_line_segment(&mut self, id: u64) {
+        // TODO: return a result instead of crashing if the line segment doesn't exist
+        // TODO: remove any constraints that reference this line segment
+        let start_point_id = self.line_segments.get(&id).unwrap().start;
+        let end_point_id = self.line_segments.get(&id).unwrap().end;
+        let mut start_is_safe = false;
+        let mut end_is_safe = false;
+        for (line_id, line) in self.line_segments.iter() {
+            if *line_id != id {
+                if line.start == start_point_id || line.end == start_point_id {
+                    start_is_safe = true;
+                }
+                if line.start == end_point_id || line.end == end_point_id {
+                    end_is_safe = true;
+                }
+            }
+        }
+        for (arc_id, arc) in self.arcs.iter() {
+            if arc.start == start_point_id
+                || arc.end == start_point_id
+                || arc.center == start_point_id
+            {
+                start_is_safe = true;
+            }
+            if arc.start == end_point_id || arc.end == end_point_id || arc.center == end_point_id {
+                end_is_safe = true;
+            }
+        }
+        for (circle_id, circle) in self.circles.iter() {
+            if circle.center == start_point_id || circle.top == start_point_id {
+                start_is_safe = true;
+            }
+            if circle.center == end_point_id || circle.top == end_point_id {
+                end_is_safe = true;
+            }
+        }
+        if !start_is_safe {
+            self.points.remove(&start_point_id);
+        }
+        if !end_is_safe {
+            self.points.remove(&end_point_id);
+        }
+
+        self.line_segments.remove(&id);
+    }
+
+    pub fn add_line_with_id(
+        &mut self,
+        start_id: u64,
+        end_id: u64,
+        id: u64,
+    ) -> Result<(), CADmiumError> {
+        if self.line_segments.contains_key(&id) {
+            return Err(CADmiumError::SketchFeatureAlreadyExists(
+                SketchFeatureType::Line,
+                id,
+            ));
+        }
+        if self.highest_line_segment_id >= id {
+            return Err(CADmiumError::SketchFeatureIDTooLow(
+                SketchFeatureType::Line,
+                id,
+            ));
+        }
+        if !self.points.contains_key(&start_id) {
+            return Err(CADmiumError::SketchFeatureMissingStart(
+                SketchFeatureType::Line,
+                id,
+            ));
+        }
+        if !self.points.contains_key(&end_id) {
+            return Err(CADmiumError::SketchFeatureMissingEnd(
+                SketchFeatureType::Line,
+                id,
+            ));
+        }
+
+        let l = Line2 {
+            start: start_id,
+            end: end_id,
+        };
+        self.line_segments.insert(id, l);
+        self.highest_line_segment_id = id;
+        Ok(())
+    }
+
+    pub fn segment_length(&self, segment_id: u64) -> f64 {
+        let segment = self.line_segments.get(&segment_id).unwrap();
+        let start = self.points.get(&segment.start).unwrap();
+        let end = self.points.get(&segment.end).unwrap();
+        let dx = end.x - start.x;
+        let dy = end.y - start.y;
+        dx.hypot(dy)
+    }
+
+    pub fn segment_angle(&self, segment_id: u64) -> f64 {
+        let segment = self.line_segments.get(&segment_id).unwrap();
+        let start = self.points.get(&segment.start).unwrap();
+        let end = self.points.get(&segment.end).unwrap();
+        start.angle_to(end)
+    }
+
+    fn apply_length_forces(
+        &mut self,
+        point_a_id: u64,
+        point_b_id: u64,
+        rest: f64,
+        kp: f64,
+        kd: f64,
+    ) {
+        let mut fx = 0.0;
+        let mut fy = 0.0;
+        let mut pa_hidden = false;
+        let mut pb_hidden = false;
+        {
+            let point_a = self.points.get(&point_a_id).unwrap();
+            let point_b = self.points.get(&point_b_id).unwrap();
+
+            let dx = point_b.x - point_a.x;
+            let dy = point_b.y - point_a.y;
+            let dist = dx.hypot(dy);
+            let err = dist - rest;
+
+            let relative_dx = point_b.dx - point_a.dx;
+            let relative_dy = point_b.dy - point_a.dy;
+
+            // project the relative velocity onto the vector between the points
+            // a is the velocity
+            // b is the vector between the points
+            // a dot b / |b|
+            let closing_velocity = (relative_dx * dx + relative_dy * dy) / dist;
+
+            let f = kp * err + kd * closing_velocity;
+            fx = f * dx / dist;
+            fy = f * dy / dist;
+
+            pa_hidden = point_a.hidden;
+            pb_hidden = point_b.hidden;
+        }
+
+        // if a point is hidden, it feels forces but does not exert them
+        if !pa_hidden {
+            let point_b = self.points.get_mut(&point_b_id).unwrap();
+            point_b.fx -= fx;
+            point_b.fy -= fy;
+        }
+        if !pb_hidden {
+            let point_a = self.points.get_mut(&point_a_id).unwrap();
+            point_a.fx += fx;
+            point_a.fy += fy;
+        }
+    }
+
+    fn apply_torsion_forces(
+        &mut self,
+        point_a_id: u64,
+        point_b_id: u64,
+        rest: f64,
+        kp: f64,
+        kd: f64,
+    ) {
+        let mut fx = 0.0;
+        let mut fy = 0.0;
+        {
+            let point_a = self.points.get(&point_a_id).unwrap();
+            let point_b = self.points.get(&point_b_id).unwrap();
+
+            let dt = 0.01;
+
+            let angle = (point_b.y - point_a.y).atan2(point_b.x - point_a.x);
+
+            let mut err = rest - angle;
+            // println!("Err: {}", err);
+            if err > PI {
+                err = err - PI * 2.0;
+            }
+            if err < -PI {
+                err = err + PI * 2.0;
+            }
+
+            let point_a_stepped = point_a.step(dt);
+            let point_b_stepped = point_b.step(dt);
+            let angle_stepped = (point_b_stepped.1 - point_a_stepped.1)
+                .atan2(point_b_stepped.0 - point_a_stepped.0);
+            let mut angle_change = angle_stepped - angle;
+            // println!("Dangle: {}", angle_change);
+
+            if angle_change > PI {
+                angle_change = angle_change - PI * 2.0;
+            }
+            if angle_change < -PI {
+                angle_change = angle_change + PI * 2.0;
+            }
+
+            let d_angle = angle_change / dt;
+            let torque = kp * err - kd * d_angle;
+
+            let dx = point_b.x - point_a.x;
+            let dy = point_b.y - point_a.y;
+            let dist = dx.hypot(dy);
+
+            let f_mag = torque / dist;
+
+            fx = f_mag * dy;
+            fy = -f_mag * dx;
+        }
+
+        let point_a = self.points.get_mut(&point_a_id).unwrap();
+        point_a.fx += fx;
+        point_a.fy += fy;
+
+        let point_b = self.points.get_mut(&point_b_id).unwrap();
+        point_b.fx -= fx;
+        point_b.fy -= fy;
+    }
+
+    pub fn solve(&mut self, steps: u64) -> bool {
+        let tolerance = 1e-12;
+
+        for _ in 0..steps {
+            let retval = self.take_a_step();
+            if retval < tolerance {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    pub fn apply_forces(&mut self, constraint_id: u64) {
+        let constraint = self.constraints.get(&constraint_id).unwrap().clone();
+
+        match constraint {
+            Constraint::SegmentsEqual {
+                segment_a_id,
+                segment_b_id,
+                kp,
+                kd,
+                ..
+            } => {
+                let a = self.line_segments.get(&segment_a_id).unwrap();
+                let b = self.line_segments.get(&segment_b_id).unwrap();
+
+                // TODO: is there a better way to satisfy the borrow checker?
+                let mut average_length = 0.0;
+                let mut a_start = 0;
+                let mut b_start = 0;
+                let mut a_end = 0;
+                let mut b_end = 0;
+                {
+                    average_length = (self.segment_length(segment_a_id)
+                        + self.segment_length(segment_b_id))
+                        / 2.0;
+                    a_start = a.start;
+                    b_start = b.start;
+                    a_end = a.end;
+                    b_end = b.end;
+                }
+                self.apply_length_forces(a_start, a_end, average_length, kp, kd);
+                self.apply_length_forces(b_start, b_end, average_length, kp, kd);
+            }
+            Constraint::SegmentLength {
+                segment_id,
+                length,
+                kp,
+                kd,
+                ..
+            } => {
+                let segment = self.line_segments.get(&segment_id).unwrap();
+                self.apply_length_forces(segment.start, segment.end, length, kp, kd)
+            }
+            Constraint::CircleDiameter {
+                circle_id,
+                diameter,
+                kp,
+                kd,
+                ..
+            } => {
+                let circle = self.circles.get(&circle_id).unwrap();
+                let center = self.points.get(&circle.center).unwrap();
+                let top = self.points.get(&circle.top).unwrap();
+                let radius = center.distance_to(top);
+
+                self.apply_length_forces(circle.center, circle.top, diameter / 2.0, kp, kd)
+            }
+            Constraint::SegmentAngle {
+                segment_id,
+                angle,
+                kp,
+                kd,
+                ..
+            } => {
+                let segment = self.line_segments.get(&segment_id).unwrap();
+                self.apply_torsion_forces(segment.start, segment.end, angle, kp, kd);
+            }
+        }
+    }
+
+    pub fn take_a_step(&mut self) -> f64 {
+        let dt = 0.02; // at 0.04 the system can be unstable! especially manual_rectangle()
+                       // TODO: switch to RK4?
+        let mut biggest_change = 0.0;
+        for (_point_id, point) in self.points.iter_mut() {
+            point.reset_forces();
+        }
+
+        let constraint_keys = self
+            .constraints
+            .keys()
+            .sorted()
+            .map(|k| k.clone())
+            .collect::<Vec<_>>();
+        for constraint_id in constraint_keys {
+            self.apply_forces(constraint_id);
+        }
+
+        for point in self.points.values_mut() {
+            point.apply_drag_force();
+        }
+
+        for (point_id, point) in self.points.iter_mut() {
+            if point.fixed {
+                continue;
+            }
+            let ax = point.fx / point.m;
+            let ay = point.fy / point.m;
+            point.dx += ax;
+            point.dy += ay;
+            let delta_x = 0.5 * ax * dt * dt + point.dx * dt;
+            let delta_y = 0.5 * ay * dt * dt + point.dy * dt;
+
+            if delta_x.abs() > biggest_change {
+                biggest_change = delta_x.abs();
+            }
+            if delta_y.abs() > biggest_change {
+                biggest_change = delta_y.abs();
+            }
+
+            point.x += delta_x;
+            point.y += delta_y;
+        }
+
+        // update any circles whose radii might have changed!
+        for (_circle_id, circle) in self.circles.iter_mut() {
+            let center = self.points.get(&circle.center).unwrap();
+            let top = self.points.get(&circle.top).unwrap();
+            circle.radius = center.distance_to(top);
+        }
+
+        biggest_change
+    }
+
+    pub fn print_state_minimal(&self) {
+        let mut data = vec![];
+        for (point_id, point) in self.points.iter().sorted_by_key(|(id, _)| *id) {
+            data.push(*point_id as f64);
+            data.push(point.x);
+            data.push(point.y);
+        }
+        let strings = data.iter().map(|x| x.to_string()).collect::<Vec<_>>();
+        println!("{}", strings.join(","));
+    }
+
+    pub fn print_state(&self) {
+        let mut data = vec![];
+        for (_point_id, point) in self.points.iter() {
+            data.push(point.x);
+            data.push(point.y);
+            data.push(point.dx);
+            data.push(point.dy);
+            data.push(point.fx);
+            data.push(point.fy);
+        }
+        let strings = data.iter().map(|x| x.to_string()).collect::<Vec<_>>();
+        println!("{}", strings.join(","));
+    }
+
+    pub fn find_faces(&self) -> (Vec<Face>, Vec<Segment>) {
+        let mut segments_overall: Vec<Segment> = vec![];
+
+        for line_id in self.line_segments.keys().sorted() {
+            let line = self.line_segments.get(line_id).unwrap();
+            segments_overall.push(Segment::Line(line.clone()));
+        }
+        for arc_id in self.arcs.keys().sorted() {
+            let arc = self.arcs.get(arc_id).unwrap();
+            segments_overall.push(Segment::Arc(arc.clone()));
+        }
+
+        let (rings, unused_segments) = self.find_rings(segments_overall, false);
+        // println!("Found {} rings", rings.len());
+        // for ring in &rings {
+        //     println!("{:?}", ring);
+        // }
+        // println!("Found {} unused segments", unused_segments.len());
+        let mut faces: Vec<Face> = rings.iter().map(|r| Face::from_ring(r)).collect();
+
+        if rings.len() == 0 {
+            return (faces, unused_segments);
+        }
+
+        // this next block of code converts everything to Polygons just so we can
+        // determine what faces contain which other faces. It's a bit of a waste
+        // because geo is a relatively heavy dependency and we don't need all of it
+        let polygons: Vec<Polygon> = rings.iter().map(|r| self.as_polygon(r)).collect();
+        // they are already sorted from smallest to largest area - self.find_rings does this
+        let mut what_contains_what: Vec<(usize, usize)> = vec![];
+
+        for smaller_polygon_index in 0..polygons.len() - 1 {
+            let smaller_polygon = &polygons[smaller_polygon_index];
+
+            for bigger_polygon_index in smaller_polygon_index + 1..polygons.len() {
+                let bigger_polygon = &polygons[bigger_polygon_index];
+                let inside = bigger_polygon.contains(smaller_polygon);
+
+                if inside {
+                    what_contains_what.push((bigger_polygon_index, smaller_polygon_index));
+                    break;
+                }
+            }
+        }
+
+        // cool, now we know what faces contain which other faces. Let's just add the holes
+        for (bigger_index, smaller_index) in what_contains_what {
+            let smaller_face = &faces[smaller_index].clone();
+            faces[bigger_index].add_hole(smaller_face)
+        }
+
+        // let faces: Vec<Face> = polygons.iter().map(|p| Face::from_polygon(p)).collect();
+        (faces, unused_segments)
+    }
+
+    pub fn find_rings(&self, segments: Vec<Segment>, debug: bool) -> (Vec<Ring>, Vec<Segment>) {
+        // We are handed all of the segments to consider
+        let mut segments_overall = segments.clone();
+        let num_segments = segments_overall.len();
+
+        // Let's double it by reversing each one and adding it to the list of
+        // segments to consider
+        let segments_reversed: Vec<Segment> =
+            segments_overall.iter().map(|s| s.reverse()).collect();
+        segments_overall.extend(segments_reversed);
+
+        // keep track of every index we've already used--each segment can only be used once
+        let mut used_indices: Vec<usize> = vec![];
+        // this is the output variable
+        let mut new_rings: Vec<Vec<usize>> = vec![];
+
+        for (seg_idx, s) in segments_overall.iter().enumerate() {
+            if debug {
+                // println!("Starting a loop with segment: {:?}", s);
+                match s {
+                    Segment::Line(line) => {
+                        println!(
+                            "Line: ({}, {}) to ({}, {})",
+                            self.points.get(&line.start).unwrap().x,
+                            self.points.get(&line.start).unwrap().y,
+                            self.points.get(&line.end).unwrap().x,
+                            self.points.get(&line.end).unwrap().y
+                        );
+                    }
+                    Segment::Arc(arc) => {
+                        println!(
+                            "Arc: center: ({}, {}), start: ({}, {}), end: ({}, {})",
+                            self.points.get(&arc.center).unwrap().x,
+                            self.points.get(&arc.center).unwrap().y,
+                            self.points.get(&arc.start).unwrap().x,
+                            self.points.get(&arc.start).unwrap().y,
+                            self.points.get(&arc.end).unwrap().x,
+                            self.points.get(&arc.end).unwrap().y
+                        );
+                    }
+                }
+            }
+            if used_indices.contains(&seg_idx) {
+                if debug {
+                    println!("Skipping because it's been used");
+                }
+                continue;
+            }
+            // this variable will accumulate the indices of our new ring
+            let mut new_ring_indices: Vec<usize> = vec![];
+            let starting_point = s.get_start();
+            if debug {
+                println!("Starting point: {:?}", starting_point);
+            }
+
+            let mut next_segment_index: usize = seg_idx;
+            for _i in 1..segments_overall.len() {
+                let next_segment = segments_overall.get(next_segment_index).unwrap();
+                if debug {
+                    println!("next segment: {:?}", next_segment);
+                }
+                new_ring_indices.push(next_segment_index);
+
+                match self.find_next_segment_index(
+                    &segments_overall,
+                    next_segment,
+                    &used_indices,
+                    debug,
+                ) {
+                    None => {
+                        if debug {
+                            println!("\tno viable next segments!");
+                        }
+                        break;
+                    }
+                    Some(idx) => next_segment_index = idx,
+                }
+                if next_segment.get_end() == starting_point {
+                    if debug {
+                        println!("\tomg finished!");
+                        println!("\tring indices: {:?}", new_ring_indices);
+                    }
+                    new_rings.push(new_ring_indices.clone());
+                    used_indices.extend(new_ring_indices);
+                    break;
+                }
+            }
+        }
+
+        let used_indices_set = used_indices.iter().cloned().collect::<HashSet<_>>();
+        let all_indices_set = (0..segments_overall.len()).collect::<HashSet<_>>();
+
+        let unused_indices_set = all_indices_set
+            .difference(&used_indices_set)
+            .collect::<HashSet<_>>();
+        let unused_indices = unused_indices_set
+            .iter()
+            .cloned()
+            .filter(|idx| return *idx < &num_segments)
+            .collect::<Vec<_>>();
+        let unused_segments = unused_indices
+            .iter()
+            .cloned()
+            .map(|idx| segments_overall.get(*idx).unwrap().clone())
+            .collect::<Vec<_>>();
+
+        let mut all_rings: Vec<Ring> = vec![];
+        for ring_indices in new_rings.iter() {
+            // let mut this_ring: Ring = Ring::Segments(vec![]);
+            let mut this_ring: Vec<Segment> = vec![];
+            for segment_index in ring_indices {
+                let actual_segment: &Segment = segments_overall.get(*segment_index).unwrap();
+                this_ring.push(actual_segment.clone());
+            }
+            all_rings.push(Ring::Segments(this_ring));
+        }
+
+        // println!("--Found {} rings", all_rings.len());
+
+        // Circles are trivially rings!
+        for (_circle_id, circle) in self.circles.iter() {
+            all_rings.push(Ring::Circle(circle.clone()));
+        }
+
+        all_rings.sort_by(|r1, r2| {
+            // TODO: implement signed_area for a ring which is made of arcs
+            self.signed_area(r1)
+                .partial_cmp(&self.signed_area(r2))
+                .unwrap()
+        });
+
+        // filter out to only the positive-valued ones
+        all_rings = all_rings
+            .iter()
+            .filter(|r| self.signed_area(r) > 0.0)
+            .cloned()
+            .collect();
+
+        // println!("--Found {} rings", all_rings.len());
+
+        (all_rings, unused_segments)
+    }
+
+    pub fn find_next_segment_index(
+        &self,
+        segments: &Vec<Segment>,
+        starting_segment: &Segment,
+        used_indices: &Vec<usize>,
+        debug: bool,
+    ) -> Option<usize> {
+        // println!("Finding next segment index");
+        let mut matches: Vec<(usize, f64, f64)> = vec![];
+        let mut this_segment_end_angle = match starting_segment {
+            Segment::Line(line) => self.line_end_angle(line),
+            Segment::Arc(arc) => self.arc_end_angle(arc),
+        };
+        this_segment_end_angle = (this_segment_end_angle + PI) % (2.0 * PI);
+
+        for (idx, s2) in segments.iter().enumerate() {
+            if used_indices.contains(&idx) {
+                continue;
+            }
+            if s2.continues(&starting_segment) && !s2.equals_or_reverse_equals(&starting_segment) {
+                let starting_angle = match s2 {
+                    Segment::Line(line) => self.line_start_angle(line),
+                    Segment::Arc(arc) => self.arc_start_angle(arc),
+                };
+                let angle_diff = angle_difference(this_segment_end_angle, starting_angle);
+                matches.push((idx, starting_angle, angle_diff));
+                // angle_diff measures how hard you'd have to turn left to continue the path from
+                // starting_segment to s2, where a straight line would be 180, a left turn 270, a right turn 90.
+                // This is important later because to make the smallest loops possible, we always want to be
+                // turning left as hard as possible when finding rings.
+            }
+        }
+
+        if matches.len() == 0 {
+            None
+        } else if matches.len() == 1 {
+            Some(matches[0].0)
+        } else {
+            if debug {
+                println!("\tMultiple options! Deciding which one to take...");
+            }
+
+            let mut best_option = 0;
+            let mut hardest_left_turn = 0.0;
+            for o in matches.iter() {
+                // println!("Option: {:?}", segments.get(o.0).unwrap());
+                // println!("Option: {} angle {}", o.0, o.1 * 180.0 / PI);
+                // println!("Option: {}", o.2 * 180.0 / PI);
+                // println!();
+
+                if o.2 > hardest_left_turn {
+                    hardest_left_turn = o.2;
+                    best_option = o.0;
+                }
+            }
+            // println!("Best option: {}", best_option);
+            Some(best_option)
+        }
+    }
+
+    pub fn circle_intersection(&self, circle_a: &Circle2, circle_b: &Circle2) -> Vec<Point2> {
+        // See https://math.stackexchange.com/questions/256100/how-can-i-find-the-points-at-which-two-circles-intersect#comment4306998_1367732
+        // See https://gist.github.com/jupdike/bfe5eb23d1c395d8a0a1a4ddd94882ac
+        let center_a = self.points.get(&circle_a.center).unwrap();
+        let center_b = self.points.get(&circle_b.center).unwrap();
+        let r_a = circle_a.radius;
+        let r_b = circle_b.radius;
+
+        let center_dx = center_b.x - center_a.x;
+        let center_dy = center_b.y - center_a.y;
+        let center_dist = center_dx.hypot(center_dy);
+
+        if !(center_dist <= r_a + r_b && center_dist >= r_a - r_b) {
+            return vec![];
+        }
+
+        let r_2 = center_dist * center_dist;
+        let r_4 = r_2 * r_2;
+        let a = (r_a * r_a - r_b * r_b) / (2.0 * r_2);
+        let r_2_r_2 = r_a * r_a - r_b * r_b;
+        let c = (2.0 * (r_a * r_a + r_b * r_b) / r_2 - r_2_r_2 * r_2_r_2 / r_4 - 1.0).sqrt();
+
+        let fx = (center_a.x + center_b.x) / 2.0 + a * (center_b.x - center_a.x);
+        let gx = c * (center_b.y - center_a.y) / 2.0;
+        let ix1 = fx + gx;
+        let ix2 = fx - gx;
+
+        let fy = (center_a.y + center_b.y) / 2.0 + a * (center_b.y - center_a.y);
+        let gy = c * (center_a.x - center_b.x) / 2.0;
+        let iy1 = fy + gy;
+        let iy2 = fy - gy;
+
+        vec![Point2::new(ix1, iy1), Point2::new(ix2, iy2)]
+    }
+
+    pub fn line_intersection(&self, line_a: &Line2, line_b: &Line2) -> Option<Point2> {
+        let start_a = self.points.get(&line_a.start).unwrap();
+        let end_a = self.points.get(&line_a.end).unwrap();
+        let start_b = self.points.get(&line_b.start).unwrap();
+        let end_b = self.points.get(&line_b.end).unwrap();
+
+        let line_a = Line::new(
+            geo::Coord {
+                x: start_a.x,
+                y: start_a.y,
+            },
+            geo::Coord {
+                x: end_a.x,
+                y: end_a.y,
+            },
+        );
+        let line_b = Line::new(
+            geo::Coord {
+                x: start_b.x,
+                y: start_b.y,
+            },
+            geo::Coord {
+                x: end_b.x,
+                y: end_b.y,
+            },
+        );
+
+        let intersection = line_intersection(line_a, line_b);
+
+        match intersection {
+            Some(line_intersection) => match line_intersection {
+                LineIntersection::SinglePoint {
+                    intersection,
+                    is_proper,
+                } => Some(Point2::new(intersection.x, intersection.y)),
+                LineIntersection::Collinear { intersection } => panic!("Collinear!"),
+            },
+            None => None,
+        }
+    }
+}
+
+pub fn arc_to_points(
+    start: &Point2,
+    end: &Point2,
+    center: &Point2,
+    clockwise: bool,
+) -> Vec<Point2> {
+    let r = (center.x - start.x).hypot(center.y - start.y);
+    let circle_tolerance: f64 = 0.001; // in meters
+    let k = circle_tolerance / r;
+    let mut n = (PI / (2.0 * k).sqrt()).ceil() as i64;
+
+    let segment_angle = (2.0 * PI) / n as f64;
+    let segment_length = r * segment_angle;
+    let start_angle = (start.y - center.y).atan2(start.x - center.x);
+
+    let mut line_vertices: Vec<Point2> = vec![];
+    line_vertices.push(Point2::new(start.x, start.y));
+
+    if clockwise {
+        n = -n;
+    }
+
+    for i in 1..n.abs() {
+        let theta = ((2.0 * PI) / n as f64) * i as f64 + start_angle;
+        let x_component = r * theta.cos();
+        let y_component = r * theta.sin();
+        let point = Point2::new(x_component + center.x, y_component + center.y);
+        line_vertices.push(point.clone());
+
+        let distance_to_end = point.distance_to(end);
+        if (distance_to_end <= segment_length) {
+            line_vertices.push(Point2::new(end.x, end.y));
+            break;
+        }
+    }
+
+    line_vertices
+}
+
+pub struct IncrementingMap<T> {
+    pub items: IndexMap<u64, T>,
+    next_id: u64,
+}
+
+impl<T> IncrementingMap<T> {
+    pub fn new() -> Self {
+        IncrementingMap {
+            items: IndexMap::new(),
+            next_id: 0,
+        }
+    }
+
+    pub fn add_item(&mut self, item: T) -> u64 {
+        let id = self.next_id;
+        self.items.insert(id, item);
+        self.next_id += 1;
+        id
+    }
+
+    pub fn remove_item(&mut self, id: u64) -> u64 {
+        self.items.remove(&id);
+        id
+    }
+
+    pub fn get_item(&self, id: u64) -> Option<&T> {
+        self.items.get(&id)
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Point2 {
+    pub x: f64,
+    pub y: f64,
+    m: f64,
+    dx: f64,
+    dy: f64,
+    fx: f64,
+    fy: f64,
+    fixed: bool,
+    pub hidden: bool,
+}
+
+impl Point2 {
+    pub fn new(x: f64, y: f64) -> Self {
+        Point2 {
+            x,
+            y,
+            m: 1.0,
+            dx: 0.0,
+            dy: 0.0,
+            fx: 0.0,
+            fy: 0.0,
+            fixed: false,
+            hidden: false,
+        }
+    }
+
+    pub fn new_fixed(x: f64, y: f64) -> Self {
+        Point2 {
+            x,
+            y,
+            m: 1.0,
+            dx: 0.0,
+            dy: 0.0,
+            fx: 0.0,
+            fy: 0.0,
+            fixed: true,
+            hidden: false,
+        }
+    }
+
+    pub fn new_hidden(x: f64, y: f64) -> Self {
+        Point2 {
+            x,
+            y,
+            m: 1.0,
+            dx: 0.0,
+            dy: 0.0,
+            fx: 0.0,
+            fy: 0.0,
+            fixed: false,
+            hidden: true,
+        }
+    }
+
+    fn reset_forces(&mut self) {
+        self.fx = 0.0;
+        self.fy = 0.0;
+    }
+
+    pub fn apply_drag_force(&mut self) {
+        let drag_coefficient = 0.1;
+        let drag_force = -drag_coefficient * self.dx;
+        self.fx += drag_force;
+        let drag_force = -drag_coefficient * self.dy;
+        self.fy += drag_force;
+    }
+
+    fn step(&self, dt: f64) -> (f64, f64) {
+        (self.x + self.dx * dt, self.y + self.dy * dt)
+    }
+
+    fn distance_to(&self, other: &Point2) -> f64 {
+        let dx = self.x - other.x;
+        let dy = self.y - other.y;
+        dx.hypot(dy)
+    }
+
+    fn angle_to(&self, other: &Point2) -> f64 {
+        (other.y - self.y).atan2(other.x - self.x)
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Vector2 {
+    pub x: f64,
+    pub y: f64,
+}
+
+impl Vector2 {
+    pub fn new(x: f64, y: f64) -> Self {
+        Vector2 { x, y }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Circle2 {
+    pub center: u64,
+    pub radius: f64,
+    pub top: u64,
+}
+
+impl Circle2 {
+    pub fn equals(&self, other: &Self) -> bool {
+        self.center == other.center && self.radius == other.radius
+    }
+
+    pub fn canonical_string(&self) -> String {
+        format!("{}-{}", self.center, self.radius)
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Arc2 {
+    pub center: u64,
+    pub start: u64,
+    pub end: u64,
+    pub clockwise: bool,
+}
+
+impl Arc2 {
+    pub fn reverse(&self) -> Self {
+        Arc2 {
+            center: self.center,
+            start: self.end,
+            end: self.start,
+            clockwise: !self.clockwise,
+        }
+    }
+
+    pub fn canonical_string(&self) -> String {
+        if self.start < self.end {
+            format!(
+                "{}-{}-{}-{}",
+                self.start, self.end, self.center, self.clockwise
+            )
+        } else {
+            self.reverse().canonical_string()
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Line2 {
+    pub start: u64,
+    pub end: u64,
+}
+
+impl Line2 {
+    pub fn reverse(&self) -> Self {
+        Line2 {
+            start: self.end,
+            end: self.start,
+        }
+    }
+
+    pub fn canonical_string(&self) -> String {
+        if self.start < self.end {
+            format!("{}-{}", self.start, self.end)
+        } else {
+            format!("{}-{}", self.end, self.start)
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(tag = "type")]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Segment {
+    Line(Line2),
+    Arc(Arc2),
+}
+
+impl Segment {
+    pub fn reverse(&self) -> Self {
+        match self {
+            Segment::Line(line) => Segment::Line(line.reverse()),
+            Segment::Arc(arc) => Segment::Arc(arc.reverse()),
+        }
+    }
+
+    pub fn get_start(&self) -> u64 {
+        match self {
+            Segment::Line(line) => line.start,
+            Segment::Arc(arc) => arc.start,
+        }
+    }
+
+    pub fn get_end(&self) -> u64 {
+        match self {
+            Segment::Line(line) => line.end,
+            Segment::Arc(arc) => arc.end,
+        }
+    }
+
+    pub fn continues(&self, prior_segment: &Segment) -> bool {
+        // determines if this segment continues the prior segment
+        prior_segment.get_end() == self.get_start()
+    }
+
+    pub fn equals_or_reverse_equals(&self, other: &Self) -> bool {
+        self == other || self == &other.reverse()
+    }
+
+    pub fn reverse_equals(&self, other: &Self) -> bool {
+        self == &other.reverse()
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum Ring {
+    Circle(Circle2),
+    Segments(Vec<Segment>),
+}
+
+impl Ring {
+    pub fn adjacent_edges(&self, other: &Self) -> Option<(Vec<usize>, Vec<usize>)> {
+        match (self, other) {
+            (Ring::Segments(segments_a), Ring::Segments(segments_b)) => {
+                let mut edge_indices_a: Vec<usize> = vec![];
+                let mut edge_indices_b: Vec<usize> = vec![];
+                for (index_a, segment_a) in segments_a.iter().enumerate() {
+                    for (index_b, segment_b) in segments_b.iter().enumerate() {
+                        if segment_a.reverse_equals(segment_b) {
+                            edge_indices_a.push(index_a);
+                            edge_indices_b.push(index_b);
+                        }
+                    }
+                }
+                if edge_indices_a.len() == 0 {
+                    return None;
+                } else {
+                    Some((edge_indices_a, edge_indices_b))
+                }
+            }
+            _ => None,
+        }
+    }
+
+    pub fn equals(&self, other: &Self) -> bool {
+        match (self, other) {
+            (Ring::Circle(circle_a), Ring::Circle(circle_b)) => circle_a.equals(circle_b),
+            (Ring::Segments(segments_a), Ring::Segments(segments_b)) => {
+                segments_a.len() == segments_b.len()
+                    && segments_a
+                        .iter()
+                        .zip(segments_b.iter())
+                        .all(|(a, b)| a == b)
+            }
+            _ => false,
+        }
+    }
+
+    pub fn canonical_form(&self) -> Self {
+        // sort the segments in order by first finding the segment with the smallest start point
+        // and then rotating the list so that that segment is first
+        match self {
+            Ring::Circle(circle) => Ring::Circle(circle.clone()),
+            Ring::Segments(segments) => {
+                let mut canonical_segments: Vec<Segment> = vec![];
+                let mut min_index = 0;
+                let mut min_segment = segments.get(0).unwrap();
+                for (i, segment) in segments.iter().enumerate() {
+                    if segment.get_start() < min_segment.get_start() {
+                        min_index = i;
+                        min_segment = segment;
+                    }
+                }
+
+                for i in 0..segments.len() {
+                    canonical_segments.push(
+                        segments
+                            .get((i + min_index) % segments.len())
+                            .unwrap()
+                            .clone(),
+                    );
+                }
+
+                Ring::Segments(canonical_segments)
+            }
+        }
+    }
+
+    pub fn reverse(&self) -> Self {
+        match self {
+            Ring::Circle(circle) => Ring::Circle(circle.clone()),
+            Ring::Segments(segments) => {
+                let mut reversed_segments: Vec<Segment> = vec![];
+                for segment in segments.iter().rev() {
+                    reversed_segments.push(segment.reverse());
+                }
+                Ring::Segments(reversed_segments)
+            }
+        }
+    }
+}
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Face {
+    pub exterior: Ring,
+    pub holes: Vec<Ring>,
+}
+
+impl Face {
+    pub fn from_ring(ring: &Ring) -> Face {
+        Face {
+            exterior: ring.clone(),
+            holes: vec![],
+        }
+    }
+
+    pub fn add_hole(&mut self, hole: &Face) {
+        self.holes.push(hole.exterior.clone());
+    }
+}
+
+pub fn angle(a: &Point2, b: &Point2, c: &Point2) -> f64 {
+    // output range is (0, 2*PI]
+    let ba_dx: f64 = a.x - b.x;
+    let ba_dy: f64 = a.y - b.y;
+    let ba_angle: f64 = ba_dy.atan2(ba_dx);
+
+    let bc_dx = c.x - b.x;
+    let bc_dy = c.y - b.y;
+    let bc_angle = bc_dy.atan2(bc_dx);
+
+    let mut naive_angle = bc_angle - ba_angle;
+    if naive_angle <= 0.0 {
+        naive_angle += TAU;
+    }
+    naive_angle
+}
+
+pub fn min_angle_diff(a0: f64, a1: f64) -> f64 {
+    let path_a = angle_difference(a0, a1);
+    let path_b = angle_difference(a1, a0);
+    if path_a < path_b {
+        path_a
+    } else {
+        path_b
+    }
+}
+
+pub fn angle_difference(mut a0: f64, mut a1: f64) -> f64 {
+    if a0 > TAU {
+        a0 -= TAU;
+    }
+    if a0 < 0.0 {
+        a0 += TAU;
+    }
+
+    if a1 > TAU {
+        a1 -= TAU;
+    }
+    if a1 < 0.0 {
+        a1 += TAU;
+    }
+
+    let mut naive_diff = a1 - a0;
+    if naive_diff > TAU {
+        naive_diff -= TAU;
+    }
+    if naive_diff < 0.0 {
+        naive_diff += TAU;
+    }
+
+    naive_diff
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::project::Project;
+
+    use super::*;
+
+    #[test]
+    fn arc_to_points_90() {
+        let mut sketch = Sketch::new();
+        let center = sketch.add_point(0.0, 0.0);
+        let start = sketch.add_point(1.0, 0.0);
+        let end = sketch.add_point(0.0, 1.0);
+        let arc_id = sketch.add_arc(center, start, end, false);
+        let arc = sketch.arcs.get(&arc_id).unwrap();
+
+        let points = sketch.arc_to_points(&arc);
+        assert_eq!(points.len(), 19);
+    }
+
+    #[test]
+    fn arc_to_points_neg_90() {
+        let mut sketch = Sketch::new();
+        let center = sketch.add_point(0.0, 0.0);
+        let start = sketch.add_point(0.0, 1.0);
+        let end = sketch.add_point(1.0, 0.0);
+        let arc_id = sketch.add_arc(center, start, end, true);
+        let arc = sketch.arcs.get(&arc_id).unwrap();
+
+        let points = sketch.arc_to_points(&arc);
+        assert_eq!(points.len(), 19);
+
+        for point in points {
+            println!("Point: ({}, {})", point.x, point.y);
+        }
+    }
+
+    #[test]
+    fn arc_to_points_180() {
+        let mut sketch = Sketch::new();
+        let center = sketch.add_point(0.0, 0.0);
+        let start = sketch.add_point(1.0, 0.0);
+        let end = sketch.add_point(-1.0, 0.0);
+        let arc_id = sketch.add_arc(center, start, end, false);
+        let arc = sketch.arcs.get(&arc_id).unwrap();
+
+        let points = sketch.arc_to_points(&arc);
+        assert_eq!(points.len(), 37);
+    }
+
+    #[test]
+    fn arc_to_points70() {
+        let mut sketch = Sketch::new();
+        let center = sketch.add_point(0.0, 0.0);
+        let start = sketch.add_point(1.0, 0.0);
+        let end = sketch.add_point(0.0, -1.0);
+        let arc_id = sketch.add_arc(center, start, end, false);
+        let arc = sketch.arcs.get(&arc_id).unwrap();
+
+        let points = sketch.arc_to_points(&arc);
+        assert_eq!(points.len(), 55);
+    }
+
+    #[test]
+    fn delete_lines() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_fixed_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, -0.1);
+        let c = sketch.add_point(1.1, 0.9);
+        let d = sketch.add_point(-0.1, 0.9);
+
+        let segment_ab = sketch.add_segment(a, b);
+        let segment_bc = sketch.add_segment(b, c);
+        let segment_cd = sketch.add_segment(c, d);
+        let segment_da = sketch.add_segment(d, a);
+
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 4);
+
+        sketch.delete_line_segment(segment_ab);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 4);
+
+        sketch.delete_line_segment(segment_bc);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 3);
+
+        sketch.delete_line_segment(segment_cd);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 2);
+
+        sketch.delete_line_segment(segment_da);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 0);
+    }
+
+    #[test]
+    fn delete_arcs() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(1.0, 0.0);
+        let b = sketch.add_point(2.0, 1.0);
+        let c = sketch.add_point(1.0, 2.0);
+        let d = sketch.add_point(0.0, 1.0);
+        let center = sketch.add_point(1.0, 1.0);
+
+        let arc_ab = sketch.add_arc(center, a, b, false);
+        let arc_bc = sketch.add_arc(center, b, c, false);
+        let arc_cd = sketch.add_arc(center, c, d, false);
+        let arc_da = sketch.add_arc(center, d, a, false);
+
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 5);
+
+        sketch.delete_arc(arc_ab);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 5);
+
+        sketch.delete_arc(arc_bc);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 4);
+
+        sketch.delete_arc(arc_cd);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 3);
+
+        sketch.delete_arc(arc_da);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 0);
+    }
+
+    #[test]
+    fn delete_circles() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(1.0, 1.0);
+        let circle_a = sketch.add_circle(center, 1.0);
+        let circle_b = sketch.add_circle(center, 2.0);
+
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 3);
+
+        sketch.delete_circle(circle_a);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 2);
+
+        sketch.delete_circle(circle_b);
+        println!("points: {:?}", sketch.points.len());
+        assert_eq!(sketch.points.len(), 0);
+    }
+}
diff --git a/packages/cadmium/src/sketch/svg.rs b/packages/cadmium/src/sketch/svg.rs
new file mode 100644
index 00000000..d13ea554
--- /dev/null
+++ b/packages/cadmium/src/sketch/svg.rs
@@ -0,0 +1,640 @@
+use crate::sketch::{Arc2, Circle2, IncrementingMap, Line2, Point2, Ring, Segment, Sketch};
+use std::f64::consts::PI;
+
+use svg::node::element::path::Data;
+// use svg::node::element::Circle;
+use std::fs;
+use svg::node::element::Path;
+use svg::Document;
+
+impl Sketch {
+    pub fn save_svg(&self, filename: &str) {
+        // Find the maximum extent of the points so we can set a viewport
+        let mut extended_points: Vec<Point2> = self.points.values().map(|p| p.clone()).collect();
+
+        for (_circle_id, circle) in self.circles.iter() {
+            let center = self.points.get(&circle.center).unwrap();
+            let left = Point2::new(center.x - circle.radius, center.y);
+            let right = Point2::new(center.x + circle.radius, center.y);
+            let top = Point2::new(center.x, center.y + circle.radius);
+            let bottom = Point2::new(center.x, center.y - circle.radius);
+            extended_points.extend(vec![left, right, top, bottom]);
+        }
+
+        for (_arc_id, arc) in self.arcs.iter() {
+            let center = self.points.get(&arc.center).unwrap();
+            let start = self.points.get(&arc.start).unwrap();
+            let r = (center.x - start.x).hypot(center.y - start.y);
+            let left = Point2::new(center.x - r, center.y);
+            let right = Point2::new(center.x + r, center.y);
+            let top = Point2::new(center.x, center.y + r);
+            let bottom = Point2::new(center.x, center.y - r);
+            extended_points.extend(vec![left, right, top, bottom]);
+        }
+
+        if extended_points.len() == 0 {
+            extended_points.push(Point2::new(0.0, 0.0));
+            extended_points.push(Point2::new(1.0, 1.0));
+        }
+        let point0 = &extended_points[0];
+        let mut min_x = point0.x;
+        let mut min_y = point0.y;
+        let mut max_x = point0.x;
+        let mut max_y = point0.y;
+        for point in extended_points {
+            if point.x < min_x {
+                min_x = point.x;
+            }
+            if point.y < min_y {
+                min_y = point.y;
+            }
+            if point.x > max_x {
+                max_x = point.x;
+            }
+            if point.y > max_y {
+                max_y = point.y;
+            }
+        }
+
+        let dx = max_x - min_x;
+        let dy = max_y - min_y;
+        let buffer_percent = 10.0;
+        let buffer_x = dx * buffer_percent / 100.0;
+        let buffer_y = dy * buffer_percent / 100.0;
+
+        let mut document = Document::new().set(
+            "viewBox",
+            (
+                min_x - buffer_x,
+                -(max_y + buffer_y),
+                dx + buffer_x * 2.0,
+                dy + buffer_y * 2.0,
+            ),
+        );
+
+        // Start by creating shapes for each face
+        let (faces, unused_segments) = self.find_faces();
+
+        // println!("Making SVG. Faces:");
+        // for face in faces.iter() {
+        //     println!("{:?}", face);
+        // }
+        for face in faces.iter() {
+            let exterior = &face.exterior;
+
+            let mut data = self.ring_to_data(exterior, Data::new());
+
+            for hole in face.holes.iter() {
+                data = self.ring_to_data(hole, data);
+            }
+
+            let path = Path::new()
+                .set("fill", "none")
+                .set("stroke", "black")
+                .set("stroke-width", 0.01)
+                .set("fill-rule", "evenodd")
+                .set("d", data);
+
+            document = document.add(path);
+        }
+
+        for segment in unused_segments.iter() {
+            let mut data = Data::new();
+
+            match segment {
+                Segment::Line(line) => {
+                    let start = self.points.get(&line.start).unwrap();
+                    let end = self.points.get(&line.end).unwrap();
+                    data = data.move_to((start.x, -start.y));
+                    data = data.line_to((end.x, -end.y));
+                }
+                Segment::Arc(arc) => {
+                    let center = self.points.get(&arc.center).unwrap();
+                    let start = self.points.get(&arc.start).unwrap();
+                    let end = self.points.get(&arc.end).unwrap();
+
+                    let r = (center.x - start.x).hypot(center.y - start.y);
+
+                    data = data.move_to((start.x, -start.y));
+
+                    let arc_angle_degrees = self.arc_angle(arc) * 180.0 / PI;
+                    println!("arc_angle: {}", arc_angle_degrees);
+
+                    if arc_angle_degrees > 180.0 {
+                        println!("large arc flag!");
+                        //A rx ry x-axis-rotation large-arc-flag sweep-flag x y
+                        data = data.elliptical_arc_to((r, r, 0.0, 1, 0, end.x, -end.y));
+                    } else {
+                        //A rx ry x-axis-rotation large-arc-flag sweep-flag x y
+                        data = data.elliptical_arc_to((r, r, 0.0, 0, 0, end.x, -end.y));
+                    }
+                }
+            }
+
+            let path = Path::new()
+                .set("fill", "none")
+                .set("stroke", "black")
+                .set("stroke-width", 0.01)
+                .set("d", data);
+
+            document = document.add(path);
+        }
+
+        // for (_circle_id, circle) in self.circles.iter() {
+        //     let center = self.points.get(&circle.center).unwrap();
+
+        //     let svg_circle = Circle::new()
+        //         .set("cx", center.x)
+        //         .set("cy", -center.y)
+        //         .set("r", circle.radius)
+        //         .set("fill", "none")
+        //         .set("stroke", "black")
+        //         .set("stroke-width", 0.01);
+
+        //     document = document.add(svg_circle);
+        // }
+
+        svg::save(filename, &document).unwrap();
+    }
+
+    pub fn ring_to_data(&self, ring: &Ring, mut data: Data) -> Data {
+        match ring {
+            Ring::Circle(circle) => {
+                let center = self.points.get(&circle.center).unwrap();
+                let radius = circle.radius;
+                data = data.move_to((center.x, -center.y + radius)); // starts at bottom
+                data = data.elliptical_arc_to((
+                    radius,
+                    radius,
+                    0.0,
+                    0,
+                    0,
+                    center.x,
+                    -center.y - radius,
+                )); // arc to top
+
+                data = data.elliptical_arc_to((
+                    radius,
+                    radius,
+                    0.0,
+                    0,
+                    0,
+                    center.x,
+                    -center.y + radius,
+                )); // arc back to bottom
+
+                data
+            }
+            Ring::Segments(segments) => {
+                let mut first = true;
+                for segment in segments {
+                    match segment {
+                        Segment::Line(line) => {
+                            let start = self.points.get(&line.start).unwrap();
+                            let end = self.points.get(&line.end).unwrap();
+
+                            if first {
+                                data = data.move_to((start.x, -start.y));
+                                first = false;
+                            }
+                            data = data.line_to((end.x, -end.y));
+                        }
+                        Segment::Arc(arc) => {
+                            let center = self.points.get(&arc.center).unwrap();
+                            let start = self.points.get(&arc.start).unwrap();
+                            let end = self.points.get(&arc.end).unwrap();
+
+                            let r = (center.x - start.x).hypot(center.y - start.y);
+
+                            if first {
+                                data = data.move_to((start.x, -start.y));
+                                first = false;
+                            }
+
+                            let arc_angle_degrees = self.arc_angle(arc) * 180.0 / PI;
+                            println!("arc_angle: {}", arc_angle_degrees);
+
+                            // most small simple arcs should have this flag set to 0
+                            let mut large_arc_flag = 0;
+                            // most arcs are counterclockwise, so this flag is usually 0
+                            let mut sweep_flag = 0;
+
+                            if arc_angle_degrees > 180.0 {
+                                println!("large arc flag!");
+                                large_arc_flag = 1;
+                            }
+
+                            if arc.clockwise {
+                                sweep_flag = 1;
+                            }
+
+                            //A rx ry x-axis-rotation large-arc-flag sweep-flag x y
+                            data = data.elliptical_arc_to((
+                                r,
+                                r,
+                                0.0,
+                                large_arc_flag,
+                                sweep_flag,
+                                end.x,
+                                -end.y,
+                            ));
+                        }
+                    }
+                }
+                data
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::project::Project;
+
+    use super::*;
+
+    #[test]
+    fn empty_to_svg() {
+        let mut sketch = Sketch::new();
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/empty.svg");
+    }
+
+    #[test]
+    fn no_rings_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(0.0, 0.0);
+        let right = sketch.add_point(1.0, 0.0);
+        let top = sketch.add_point(0.0, 1.0);
+        let left = sketch.add_point(-1.0, 0.0);
+        let bottom = sketch.add_point(0.0, -1.0);
+
+        sketch.add_segment(center, right);
+        sketch.add_segment(center, top);
+        sketch.add_segment(center, left);
+        sketch.add_segment(center, bottom);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/no_rings.svg");
+    }
+
+    #[test]
+    fn circle_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let id0 = sketch.add_point(1.0, 0.0);
+        sketch.add_circle(id0, 1.0);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/circle.svg");
+    }
+
+    #[test]
+    fn square_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let id0 = sketch.add_point(0.0, 0.0);
+        let id1 = sketch.add_point(1.0, 0.0);
+        let id2 = sketch.add_point(1.0, 1.0);
+        let id3 = sketch.add_point(0.0, 1.0);
+
+        sketch.add_segment(id0, id1);
+        sketch.add_segment(id1, id2);
+        sketch.add_segment(id2, id3);
+        sketch.add_segment(id3, id0);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/square.svg");
+    }
+
+    #[test]
+    fn rounded_square_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.25, 0.0);
+        let b = sketch.add_point(0.75, 0.0);
+        let c = sketch.add_point(1.0, 0.25);
+        let d = sketch.add_point(1.0, 0.75);
+        let e = sketch.add_point(0.75, 1.0);
+        let f = sketch.add_point(0.25, 1.0);
+        let g = sketch.add_point(0.0, 0.75);
+        let h = sketch.add_point(0.0, 0.25);
+        let i = sketch.add_point(0.75, 0.25);
+        let j = sketch.add_point(0.75, 0.75);
+        let k = sketch.add_point(0.25, 0.75);
+        let l = sketch.add_point(0.25, 0.25);
+
+        sketch.add_segment(a, b);
+        sketch.add_arc(i, b, c, false);
+        sketch.add_segment(c, d);
+        sketch.add_arc(j, d, e, false);
+        sketch.add_segment(e, f);
+        sketch.add_arc(k, f, g, false);
+        sketch.add_segment(g, h);
+        sketch.add_arc(l, h, a, false);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/rounded_square.svg");
+    }
+
+    #[test]
+    fn square_with_hole_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(1.0, 1.0);
+        let d = sketch.add_point(0.0, 1.0);
+
+        let e = sketch.add_point(0.25, 0.25);
+        let f = sketch.add_point(0.75, 0.25);
+        let g = sketch.add_point(0.75, 0.75);
+        let h = sketch.add_point(0.25, 0.75);
+
+        sketch.add_segment(a, b);
+        sketch.add_segment(b, c);
+        sketch.add_segment(c, d);
+        sketch.add_segment(d, a);
+
+        sketch.add_segment(e, f);
+        sketch.add_segment(f, g);
+        sketch.add_segment(g, h);
+        sketch.add_segment(h, e);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/square_with_hole.svg");
+    }
+
+    #[test]
+    fn square_with_circular_hole_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(1.0, 1.0);
+        let d = sketch.add_point(0.0, 1.0);
+        let center = sketch.add_point(0.5, 0.5);
+
+        sketch.add_segment(a, b);
+        sketch.add_segment(b, c);
+        sketch.add_segment(c, d);
+        sketch.add_segment(d, a);
+
+        sketch.add_circle(center, 0.4);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/square_with_circular_hole.svg");
+    }
+
+    #[test]
+    fn circle_with_circular_hole_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(0.5, 0.5);
+
+        sketch.add_circle(center, 0.5);
+        sketch.add_circle(center, 0.25);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/circle_with_circular_hole.svg");
+    }
+
+    #[test]
+    fn circle_with_square_hole_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(1.0, 1.0);
+        let d = sketch.add_point(0.0, 1.0);
+        let center = sketch.add_point(0.5, 0.5);
+
+        sketch.add_segment(a, b);
+        sketch.add_segment(b, c);
+        sketch.add_segment(c, d);
+        sketch.add_segment(d, a);
+
+        sketch.add_circle(center, 1.0);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/circle_with_square_hole.svg");
+    }
+
+    #[test]
+    fn two_intersecting_squares_to_svg() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(1.0, 1.0);
+        let d = sketch.add_point(0.0, 1.0);
+        sketch.add_segment(a, b);
+        sketch.add_segment(b, c);
+        sketch.add_segment(c, d);
+        sketch.add_segment(d, a);
+
+        let e = sketch.add_point(0.5, 0.5);
+        let f = sketch.add_point(1.5, 0.5);
+        let g = sketch.add_point(1.5, 1.5);
+        let h = sketch.add_point(0.5, 1.5);
+        sketch.add_segment(e, f);
+        sketch.add_segment(f, g);
+        sketch.add_segment(g, h);
+        sketch.add_segment(h, e);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/two_intersecting_squares_unsplit.svg");
+
+        let sketch = sketch.split_intersections(false);
+        sketch.save_svg("test_svgs/two_intersecting_squares_split.svg");
+    }
+
+    #[test]
+    fn two_intersecting_circles_to_svg() {
+        // Create a new sketch
+        let mut sketch = Sketch::new();
+
+        // Add two circles which happen to intersect
+        let center_a = sketch.add_point(0.0, 0.0);
+        sketch.add_circle(center_a, 1.0);
+        let center_b = sketch.add_point(1.0, 0.0);
+        sketch.add_circle(center_b, 1.0);
+
+        // Save the naive svg: just two circular paths
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/two_intersecting_circles_unsplit.svg");
+
+        // Split the intersections, creating a new and different sketch
+        let sketch = sketch.split_intersections(false);
+
+        // Save this one as an SVG, it will have three non-overlapping paths of two arcs each
+        sketch.save_svg("test_svgs/two_intersecting_circles_split.svg");
+    }
+
+    #[test]
+    fn circle_diameter() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(0.0, 0.0);
+        let circle_id = sketch.add_circle(center, 0.5);
+        let constraint_id = sketch.add_circle_diameter_constraint(circle_id, 4.0);
+
+        sketch.solve(4000);
+
+        println!("Value: {}", sketch.constraint_value(constraint_id));
+        println!("Error: {}", sketch.constraint_error(constraint_id));
+        assert!(sketch.constraint_is_satisfied(constraint_id));
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/constraint_circle_diameter.svg");
+    }
+
+    #[test]
+    fn segments_equal() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(0.5, 0.0);
+
+        let c = sketch.add_point(0.0, 1.0);
+        let d = sketch.add_point(1.0, 1.0);
+
+        let segment_ab = sketch.add_segment(a, b); // length 0.5
+        let segment_cd = sketch.add_segment(c, d); // length 1.0
+
+        let constraint_id = sketch.add_segments_equal_constraint(segment_ab, segment_cd);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/equality_constraint_unsolved.svg");
+        assert!(sketch.solve(1000));
+        sketch.save_svg("test_svgs/equality_constraint_solved.svg");
+        println!("equality error: {}", sketch.constraint_error(constraint_id));
+    }
+
+    #[test]
+    fn triangle_constraint() {
+        let mut sketch = Sketch::new();
+
+        // initialized as a right triangle with right angle at origin
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(0.0, 1.0);
+
+        let segment_ab = sketch.add_segment(a, b);
+        let segment_bc = sketch.add_segment(b, c);
+        let segment_ca = sketch.add_segment(c, a);
+
+        let constraint_ab = sketch.add_segment_length_constraint(segment_ab, 2.0);
+        let constraint_bc = sketch.add_segment_length_constraint(segment_bc, 2.0);
+        let constraint_ca = sketch.add_segment_length_constraint(segment_ca, 2.0);
+
+        assert!(sketch.solve(1000));
+
+        assert!(sketch.all_constraints_are_satisfied());
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/constraint_triangle.svg");
+    }
+
+    #[test]
+    fn two_arcs_in_a_circle_90() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(0.0, 0.0);
+        let top = sketch.add_point(0.0, 1.0);
+        let right = sketch.add_point(1.0, 0.0);
+
+        sketch.add_arc(center, right, top, false);
+        sketch.add_arc(center, top, right, false);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/two_arcs_in_a_circle_90.svg");
+    }
+
+    #[test]
+    fn two_arcs_in_a_circle_180() {
+        let mut sketch = Sketch::new();
+
+        let center = sketch.add_point(0.0, 0.0);
+        let top = sketch.add_point(0.0, 1.0);
+        let bottom = sketch.add_point(0.0, -1.0);
+
+        sketch.add_arc(center, bottom, top, false);
+        sketch.add_arc(center, top, bottom, false);
+
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/two_arcs_in_a_circle_180.svg");
+    }
+
+    #[test]
+    fn manual_square() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_fixed_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, -0.1);
+        let c = sketch.add_point(1.1, 0.9);
+        let d = sketch.add_point(-0.1, 0.9);
+
+        let segment_ab = sketch.add_segment(a, b);
+        let segment_bc = sketch.add_segment(b, c);
+        let segment_cd = sketch.add_segment(c, d);
+        let segment_da = sketch.add_segment(d, a);
+
+        let length = 2.0;
+        sketch.add_segment_length_constraint(segment_ab, length);
+        sketch.add_segment_length_constraint(segment_bc, length);
+        sketch.add_segment_length_constraint(segment_cd, length);
+        sketch.add_segment_length_constraint(segment_da, length);
+
+        sketch.add_segment_horizontal_constraint(segment_ab);
+        sketch.add_segment_horizontal_constraint(segment_cd);
+        sketch.add_segment_vertical_constraint(segment_da);
+        sketch.add_segment_vertical_constraint(segment_bc);
+
+        // for i in 0..100 {
+        //     sketch.step();
+        //     sketch.save_svg(&format!("test_svgs/manual_square/{}.svg", i));
+        // }
+
+        sketch.solve(1000);
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/manual_square_solved.svg");
+    }
+
+    #[test]
+    fn manual_rectangle() {
+        let mut sketch = Sketch::new();
+
+        let a = sketch.add_point(0.0, 0.0);
+        let b = sketch.add_point(1.0, 0.0);
+        let c = sketch.add_point(1.0, 1.0);
+        let d = sketch.add_point(0.0, 1.0);
+
+        let segment_ab = sketch.add_segment(a, b);
+        let segment_bc = sketch.add_segment(b, c);
+        let segment_cd = sketch.add_segment(c, d);
+        let segment_da = sketch.add_segment(d, a);
+
+        sketch.add_segment_horizontal_constraint(segment_ab);
+        sketch.add_segment_horizontal_constraint(segment_cd);
+        sketch.add_segment_vertical_constraint(segment_da);
+        sketch.add_segment_vertical_constraint(segment_bc);
+
+        // fixed width of 1.0
+        sketch.add_segment_length_constraint(segment_ab, 1.0);
+        sketch.add_segment_length_constraint(segment_cd, 1.0);
+        // This should cause it to adjust!
+        sketch.add_segment_length_constraint(segment_da, 0.5);
+
+        // for i in 0..800 {
+        //     sketch.save_svg(&format!("test_svgs/manual_square/{}.svg", i));
+        //     sketch.step();
+        // }
+
+        let solved = sketch.solve(1000);
+        println!("did solve? {}", solved);
+        fs::create_dir_all("test_svgs");
+        sketch.save_svg("test_svgs/manual_rectangle_solved.svg");
+    }
+}
diff --git a/packages/cadmium/src/solid.rs b/packages/cadmium/src/solid.rs
new file mode 100644
index 00000000..9a1833bd
--- /dev/null
+++ b/packages/cadmium/src/solid.rs
@@ -0,0 +1,326 @@
+use std::collections::HashMap;
+use std::f64::consts::PI;
+
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+
+use truck_meshalgo::prelude::OptimizingFilter;
+use truck_meshalgo::tessellation::MeshableShape;
+use truck_meshalgo::tessellation::MeshedShape;
+use truck_polymesh::obj;
+use truck_polymesh::Rad;
+use truck_stepio::out;
+
+use crate::archetypes::Vector3;
+use crate::extrusion::find_transit;
+use crate::extrusion::merge_faces;
+use crate::extrusion::Direction;
+use crate::extrusion::Extrusion;
+use crate::project::{RealPlane, RealSketch};
+use crate::sketch::Vector2;
+use crate::sketch::{Face, Ring, Segment};
+
+use truck_modeling::{builder, builder::translated, Edge, Face as TruckFace, Vertex, Wire};
+
+use truck_polymesh::Point3 as TruckPoint3;
+use truck_polymesh::Vector3 as TruckVector3;
+use truck_topology::Solid as TruckSolid;
+
+#[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Solid {
+    pub name: String,
+    pub crc32: String,
+    pub vertices: Vec<Vector3>,
+    pub normals: Vec<Vector3>,
+    pub uvs: Vec<Vector2>,
+    pub indices: Vec<usize>,
+    pub triangles: Vec<Vec<u64>>,
+    pub truck_solid: TruckSolid<
+        truck_polymesh::cgmath::Point3<f64>,
+        truck_modeling::Curve,
+        truck_modeling::Surface,
+    >,
+}
+
+impl Solid {
+    pub fn from_truck_solid(
+        name: String,
+        truck_solid: TruckSolid<
+            truck_meshalgo::prelude::cgmath::Point3<f64>,
+            truck_modeling::Curve,
+            truck_modeling::Surface,
+        >,
+    ) -> Self {
+        let mut solid = Solid {
+            name,
+            crc32: "".to_owned(),
+            vertices: vec![],
+            normals: vec![],
+            triangles: vec![],
+            uvs: vec![],
+            indices: vec![],
+            truck_solid,
+        };
+        let mesh = solid.truck_solid.triangulation(0.01).to_polygon();
+
+        // the mesh is prepared for obj export, but we need to convert it
+        // to a format compatible for rendering
+        // We have to brute force this. Go through every single triangle
+        // and emit three positions, three normals, and three uvs.
+        let mut index = 0 as usize;
+        for face in mesh.tri_faces() {
+            for v in face.iter() {
+                let vertex_index = v.pos;
+                let normal_index = v.nor.unwrap();
+                let uv_index = v.uv.unwrap();
+                let vertex = mesh.positions()[vertex_index];
+                let normal = mesh.normals()[normal_index];
+                let uv = mesh.uv_coords()[uv_index];
+
+                let pt = Vector3::new(vertex.x, vertex.y, vertex.z);
+                solid.vertices.push(pt);
+                solid
+                    .normals
+                    .push(Vector3::new(normal.x, normal.y, normal.z));
+                solid.uvs.push(Vector2::new(uv.x, uv.y));
+                solid.indices.push(index);
+
+                index += 1;
+            }
+        }
+
+        // compute the crc32 of the vertices
+        let mut hasher = crc32fast::Hasher::new();
+        for vertex in solid.vertices.iter() {
+            hasher.update(&vertex.x.to_be_bytes());
+            hasher.update(&vertex.y.to_be_bytes());
+            hasher.update(&vertex.z.to_be_bytes());
+        }
+        solid.crc32 = format!("{:x}", hasher.finalize());
+
+        solid
+    }
+
+    pub fn get_face_by_normal(&self, normal: &Vector3) -> Option<TruckFace> {
+        let truck_solid = &self.truck_solid;
+        let boundaries = &truck_solid.boundaries()[0];
+
+        let mut candidate_faces: Vec<TruckFace> = vec![];
+
+        boundaries.face_iter().for_each(|face| {
+            let oriented_surface = face.oriented_surface();
+
+            match oriented_surface {
+                truck_modeling::geometry::Surface::Plane(p) => {
+                    let this_face_normal = p.normal();
+
+                    if (normal.x - this_face_normal.x).abs() < 0.0001
+                        && (normal.y - this_face_normal.y).abs() < 0.0001
+                        && (normal.z - this_face_normal.z).abs() < 0.0001
+                    {
+                        candidate_faces.push(face.clone());
+                    }
+                }
+                _ => {}
+            }
+        });
+
+        match candidate_faces.len() {
+            0 => None,
+            1 => Some(candidate_faces[0].clone()),
+            _ => panic!("More than one face with the same normal!"),
+        }
+    }
+
+    pub fn from_extrusion(
+        name: String,
+        plane: &RealPlane,
+        sketch: &RealSketch,
+        extrusion: &Extrusion,
+    ) -> HashMap<String, Self> {
+        let mut retval = HashMap::new();
+
+        let extrusion_direction = match &extrusion.direction {
+            Direction::Normal => plane.plane.tertiary.clone(),
+            Direction::NegativeNormal => plane.plane.tertiary.times(-1.0),
+            Direction::Specified(vector) => vector.clone(),
+        };
+
+        let extrusion_vector = extrusion_direction.times(extrusion.length - extrusion.offset);
+        let offset_vector = extrusion_direction.times(extrusion.offset);
+
+        let vector = TruckVector3::new(extrusion_vector.x, extrusion_vector.y, extrusion_vector.z);
+        let offset_vector = TruckVector3::new(offset_vector.x, offset_vector.y, offset_vector.z);
+
+        // Sometimes the chosen faces are touching, or one even envelops another. Let's
+        // merge those faces together so that we have single solid wherever possible
+        let unmerged_faces: Vec<Face> = extrusion
+            .face_ids
+            .iter()
+            .map(|face_id| sketch.faces.get(*face_id as usize).unwrap().clone())
+            .collect();
+        let merged_faces = merge_faces(&unmerged_faces, sketch);
+
+        for (f_index, face) in merged_faces.iter().enumerate() {
+            // let face = sketch.faces.get(*face_id as usize).unwrap();
+
+            // println!("face: {:?}", face);
+            let exterior = &face.exterior;
+            let mut wires: Vec<Wire> = Vec::new();
+
+            // the exterior wire comes first
+            wires.push(Self::to_wire(plane, sketch, extrusion, exterior));
+
+            // then the interior wires
+            for interior in &face.holes {
+                wires.push(Self::to_wire(plane, sketch, extrusion, interior).inverse());
+            }
+
+            let face = builder::try_attach_plane(&wires).unwrap();
+
+            let truck_solid = builder::tsweep(&face, vector);
+            let truck_solid = translated(&truck_solid, offset_vector);
+
+            let solid = Solid::from_truck_solid(format!("{}:{}", name, f_index), truck_solid);
+
+            retval.insert(format!("{}:{}", name, f_index), solid);
+        }
+
+        retval
+    }
+
+    pub fn to_wire(
+        plane: &RealPlane,
+        sketch: &RealSketch,
+        _extrusion: &Extrusion,
+        exterior: &Ring,
+    ) -> Wire {
+        match exterior {
+            Ring::Circle(circle) => {
+                println!("circle: {:?}", circle);
+
+                let center = sketch.points.get(&circle.center).unwrap();
+                let center_point = TruckPoint3::new(center.x, center.y, center.z);
+
+                let top = sketch.points.get(&circle.top).unwrap();
+                let top_point = TruckPoint3::new(top.x, top.y, top.z);
+
+                let vector = TruckVector3::new(
+                    plane.plane.tertiary.x,
+                    plane.plane.tertiary.y,
+                    plane.plane.tertiary.z,
+                );
+
+                // we actually achieve this with an rsweep!
+                let vertex = builder::vertex(top_point);
+                let circle = builder::rsweep(&vertex, center_point, vector, Rad(2.0 * PI));
+                circle
+            }
+            Ring::Segments(segments) => {
+                // println!("segments: {:?}", segments);
+                // let mut builder = builder::FaceBuilder::new();
+                let mut vertices: HashMap<u64, Vertex> = HashMap::new();
+
+                // First just collect all the points as Truck Vertices
+                // This is important because for shapes to be closed,
+                // Truck requires that the start point IS the end point
+                for segment in segments.iter() {
+                    match segment {
+                        Segment::Line(line) => {
+                            let start = sketch.points.get(&line.start).unwrap();
+                            let start_vertex =
+                                builder::vertex(TruckPoint3::new(start.x, start.y, start.z));
+                            let end = sketch.points.get(&line.end).unwrap();
+                            let end_vertex = builder::vertex(TruckPoint3::new(end.x, end.y, end.z));
+                            vertices.insert(line.start, start_vertex);
+                            vertices.insert(line.end, end_vertex);
+                        }
+                        Segment::Arc(arc) => {
+                            let start = sketch.points.get(&arc.start).unwrap();
+                            let start_vertex =
+                                builder::vertex(TruckPoint3::new(start.x, start.y, start.z));
+                            let end = sketch.points.get(&arc.end).unwrap();
+                            let end_vertex = builder::vertex(TruckPoint3::new(end.x, end.y, end.z));
+                            let center = sketch.points.get(&arc.center).unwrap();
+                            let center_vertex =
+                                builder::vertex(TruckPoint3::new(center.x, center.y, center.z));
+                            vertices.insert(arc.start, start_vertex);
+                            vertices.insert(arc.end, end_vertex);
+                            vertices.insert(arc.center, center_vertex);
+                        }
+                    }
+                }
+
+                let mut edges: Vec<Edge> = Vec::new();
+                // Now add the segments to the wire
+                for segment in segments.iter() {
+                    match segment {
+                        Segment::Line(line) => {
+                            let start_vertex = vertices.get(&line.start).unwrap();
+                            let end_vertex = vertices.get(&line.end).unwrap();
+                            let edge = builder::line(start_vertex, end_vertex);
+                            edges.push(edge);
+                        }
+                        Segment::Arc(arc) => {
+                            let start_point = sketch.points.get(&arc.start).unwrap();
+                            let end_point = sketch.points.get(&arc.end).unwrap();
+                            let center_point = sketch.points.get(&arc.center).unwrap();
+                            let transit = find_transit(
+                                plane,
+                                start_point,
+                                end_point,
+                                center_point,
+                                arc.clockwise,
+                            );
+
+                            let start_vertex = vertices.get(&arc.start).unwrap();
+                            let end_vertex = vertices.get(&arc.end).unwrap();
+                            let transit_point = TruckPoint3::new(transit.x, transit.y, transit.z);
+
+                            // center point is not a vertex, but a point
+                            let edge = builder::circle_arc(start_vertex, end_vertex, transit_point);
+                            edges.push(edge);
+                        }
+                    }
+                }
+
+                let wire = Wire::from_iter(edges.into_iter());
+                wire
+            }
+        }
+    }
+
+    pub fn to_obj_string(&self, tolerance: f64) -> String {
+        let mesh = self.truck_solid.triangulation(tolerance).to_polygon();
+        let mut buf = Vec::new();
+        obj::write(&mesh, &mut buf).unwrap();
+        let string = String::from_utf8(buf).unwrap();
+        string
+    }
+
+    pub fn save_as_obj(&self, filename: &str, tolerance: f64) {
+        let mesh = self.truck_solid.triangulation(tolerance).to_polygon();
+        let file = std::fs::File::create(filename).unwrap();
+        obj::write(&mesh, file).unwrap();
+    }
+
+    pub fn to_step_string(&self) -> String {
+        let compressed = self.truck_solid.compress();
+        let step_string = out::CompleteStepDisplay::new(
+            out::StepModel::from(&compressed),
+            out::StepHeaderDescriptor {
+                organization_system: "cadmium-shape-to-step".to_owned(),
+                ..Default::default()
+            },
+        )
+        .to_string();
+        step_string
+    }
+
+    pub fn save_as_step(&self, filename: &str) {
+        let step_text = self.to_step_string();
+        let mut step_file = std::fs::File::create(filename).unwrap();
+        std::io::Write::write_all(&mut step_file, step_text.as_ref()).unwrap();
+    }
+}
diff --git a/packages/cadmium/src/step.rs b/packages/cadmium/src/step.rs
new file mode 100644
index 00000000..f9802c78
--- /dev/null
+++ b/packages/cadmium/src/step.rs
@@ -0,0 +1,111 @@
+
+use serde::{Deserialize, Serialize};
+use tsify::Tsify;
+use wasm_bindgen::prelude::*;
+
+use crate::archetypes::{Plane, PlaneDescription, Point3, Vector3};
+use crate::sketch::Sketch;
+use crate::extrusion::Extrusion;
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[serde(tag = "type")]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub enum StepData {
+    Point {
+        point: Point3,
+    },
+    Plane {
+        plane: Plane,
+        width: f64,
+        height: f64,
+    },
+    Sketch {
+        plane_description: PlaneDescription,
+        width: f64,
+        height: f64,
+        sketch: Sketch,
+    },
+    Extrusion {
+        extrusion: Extrusion,
+    },
+}
+
+#[derive(Tsify, Debug, Serialize, Deserialize)]
+#[tsify(into_wasm_abi, from_wasm_abi)]
+pub struct Step {
+    pub(crate) name: String,
+    pub(crate) unique_id: String,
+    pub(crate) suppressed: bool,
+    pub(crate) data: StepData,
+}
+
+impl Step {
+    pub fn new_point(name: &str, point: Point3, point_id: u64) -> Self {
+        Step {
+            name: name.to_owned(),
+            unique_id: format!("Point-{}", point_id),
+            suppressed: false,
+            data: StepData::Point {
+                point: point.clone(),
+            },
+        }
+    }
+
+    pub fn new_plane(name: &str, plane: Plane, plane_id: u64) -> Self {
+        Step {
+            name: name.to_owned(),
+            unique_id: format!("Plane-{}", plane_id),
+            suppressed: false,
+            data: StepData::Plane {
+                plane,
+                height: 100.0,
+                width: 100.0,
+            },
+        }
+    }
+
+    pub fn new_sketch(name: &str, plane_id: &str, sketch_id: u64) -> Self {
+        Step {
+            name: name.to_owned(),
+            unique_id: format!("Sketch-{}", sketch_id),
+            suppressed: false,
+            data: StepData::Sketch {
+                plane_description: PlaneDescription::PlaneId(plane_id.to_owned()),
+                width: 1.25,
+                height: 0.75,
+                sketch: Sketch::new(),
+            },
+        }
+    }
+
+    pub fn new_sketch_on_solid_face(
+        name: &str,
+        solid_id: &str,
+        normal: Vector3,
+        sketch_id: u64,
+    ) -> Self {
+        Step {
+            name: name.to_owned(),
+            unique_id: format!("Sketch-{}", sketch_id),
+            suppressed: false,
+            data: StepData::Sketch {
+                plane_description: PlaneDescription::SolidFace {
+                    solid_id: solid_id.to_owned(),
+                    normal,
+                },
+                width: 12.5,
+                height: 7.5,
+                sketch: Sketch::new(),
+            },
+        }
+    }
+
+    pub fn new_extrusion(name: &str, extrusion: Extrusion, extrusion_id: u64) -> Self {
+        Step {
+            name: name.to_owned(),
+            unique_id: format!("Extrusion-{}", extrusion_id),
+            suppressed: false,
+            data: StepData::Extrusion { extrusion },
+        }
+    }
+}
diff --git a/packages/cadmium/src/step/actions.rs b/packages/cadmium/src/step/actions.rs
deleted file mode 100644
index d4966e5e..00000000
--- a/packages/cadmium/src/step/actions.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::message::MessageHandler;
-use crate::workbench::Workbench;
-use crate::IDType;
-
-use super::{Step, StepResult};
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct Rename {
-    pub new_name: String,
-}
-
-impl MessageHandler for Rename {
-    type Parent = Rc<RefCell<Step>>;
-    fn handle_message(
-        &self,
-        step_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut step = step_ref.borrow_mut();
-        step.name = self.new_name.clone();
-        Ok(None)
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct Delete {
-    pub step_id: IDType,
-}
-
-impl MessageHandler for Delete {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        workbench_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut workbench = workbench_ref.borrow_mut();
-        workbench.history.remove(self.step_id as usize);
-        Ok(None)
-    }
-}
diff --git a/packages/cadmium/src/step/hash.rs b/packages/cadmium/src/step/hash.rs
deleted file mode 100644
index 5161b7fe..00000000
--- a/packages/cadmium/src/step/hash.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use std::fmt::Display;
-
-use crate::message::Message;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-use xxhash_rust::xxh3::xxh3_64;
-
-/// This represents a hash of a step.
-/// It's really just a wrapper around a u64, but it's used to ensure that the hash
-/// is always calculated in the same way and doesn't get mixed
-/// with internal indexes or ids.
-/// The only way to construct a new one is to calculate a hash of a message.
-///
-/// We also implement Copy as this is just a u64.
-#[derive(Tsify, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[repr(transparent)]
-pub struct StepHash(#[tsify(type = "string")] u64);
-
-impl StepHash {
-    pub fn into_int(&self) -> u64 {
-        self.0
-    }
-
-    pub const fn from_int(val: u64) -> Self {
-        Self(val)
-    }
-}
-
-impl From<&Message> for StepHash {
-    fn from(msg: &Message) -> Self {
-        // Maybe encode to binary instead of json?
-        let hash = xxh3_64(serde_json::to_string(msg).unwrap().as_bytes());
-        Self(hash)
-    }
-}
-
-impl Display for StepHash {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-// Serialize as string
-impl Serialize for StepHash {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        self.0.to_string().serialize(serializer)
-    }
-}
-
-// Deserialize from string
-impl<'de> Deserialize<'de> for StepHash {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        let s = String::deserialize(deserializer)?;
-        Ok(Self(s.parse().unwrap()))
-    }
-}
diff --git a/packages/cadmium/src/step/mod.rs b/packages/cadmium/src/step/mod.rs
deleted file mode 100644
index c218f424..00000000
--- a/packages/cadmium/src/step/mod.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use std::cell::RefCell;
-use std::fmt::Display;
-use std::rc::Rc;
-
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::message::{Identifiable, Message};
-use crate::workbench::Workbench;
-
-pub mod actions;
-pub mod hash;
-pub mod result;
-pub mod sketch_action;
-
-pub use hash::StepHash;
-pub use result::StepResult;
-
-#[derive(Tsify, Clone, Debug, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Step {
-    pub hash: StepHash,
-    pub name: String,
-    pub suppressed: bool,
-    pub data: Message,
-    pub result: StepResult,
-}
-
-impl Step {
-    pub fn new(data: Message, result: StepResult) -> Self {
-        let hash = (&data).into();
-        Self {
-            hash: hash,
-            name: format!("{}-{}", data, hash),
-            suppressed: false,
-            data,
-            result: result,
-        }
-    }
-
-    pub fn hash(&self) -> StepHash {
-        self.hash
-    }
-}
-
-impl Display for Step {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}-{}", self.data, self.hash)
-    }
-}
-
-impl Identifiable for Rc<RefCell<Step>> {
-    type Parent = Rc<RefCell<Workbench>>;
-    const ID_NAME: &'static str = "step_id";
-
-    fn from_parent_id(parent: &Self::Parent, hash: StepHash) -> anyhow::Result<Self> {
-        Ok(parent
-            .borrow()
-            .get_step_by_hash(hash)
-            .ok_or(anyhow::anyhow!(
-                "No step with hash {} exists in the current workbench",
-                hash
-            ))?
-            .clone())
-    }
-}
diff --git a/packages/cadmium/src/step/result.rs b/packages/cadmium/src/step/result.rs
deleted file mode 100644
index 1904bdc0..00000000
--- a/packages/cadmium/src/step/result.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::cell::RefCell;
-use std::fmt::Debug;
-use std::rc::Rc;
-
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-use wasm_bindgen::convert::{IntoWasmAbi, RefFromWasmAbi};
-use wasm_bindgen::prelude::*;
-
-use crate::archetypes;
-use crate::feature::{self, solid};
-use crate::isketch::{face, ISketch};
-
-use super::sketch_action::SketchActionResult;
-
-pub trait NodeLike:
-    Debug + Clone + Serialize + DeserializeOwned + IntoWasmAbi + RefFromWasmAbi
-{
-    fn add_link(&mut self, node: StepResult);
-    fn links(&self) -> Vec<StepResult>;
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[serde(tag = "type")]
-pub enum StepResult {
-    Empty,
-    // TODO: Add a variable/expression
-    Point(Rc<RefCell<feature::point::Point3>>),
-    Plane(Rc<RefCell<archetypes::Plane>>),
-    Sketch(Rc<RefCell<ISketch>>),
-    // Primitive(Rc<RefCell<archetypes::WrappedPrimitive>>),
-    // Constraint(Rc<RefCell<isotope::constraints::Constraint>>),
-    // Compound(Rc<RefCell<compound::Compound>>),
-    SketchAction {
-        action: SketchActionResult,
-        faces: Vec<face::Face>,
-    },
-    // We need the solids to be a named field so that we can serialize it with tag = "type"
-    // otherwise it would result in { type: "Solid", Solid[] } which isn't valid
-    Solid {
-        solids: Vec<solid::Solid>,
-    },
-}
diff --git a/packages/cadmium/src/step/sketch_action.rs b/packages/cadmium/src/step/sketch_action.rs
deleted file mode 100644
index 4678f42d..00000000
--- a/packages/cadmium/src/step/sketch_action.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-
-use crate::archetypes;
-use crate::isketch::{compound, ISketch};
-
-use super::StepResult;
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-#[serde(tag = "action_type")]
-pub enum SketchActionResult {
-    Primitive(Rc<RefCell<archetypes::WrappedPrimitive>>),
-    Constraint(Rc<RefCell<isotope::constraints::Constraint>>),
-    Compound(Rc<RefCell<compound::Compound>>),
-}
-
-impl From<Rc<RefCell<archetypes::WrappedPrimitive>>> for SketchActionResult {
-    fn from(primitive: Rc<RefCell<archetypes::WrappedPrimitive>>) -> Self {
-        SketchActionResult::Primitive(primitive)
-    }
-}
-
-impl From<Rc<RefCell<isotope::constraints::Constraint>>> for SketchActionResult {
-    fn from(constraint: Rc<RefCell<isotope::constraints::Constraint>>) -> Self {
-        SketchActionResult::Constraint(constraint)
-    }
-}
-
-impl From<Rc<RefCell<compound::Compound>>> for SketchActionResult {
-    fn from(compound: Rc<RefCell<compound::Compound>>) -> Self {
-        SketchActionResult::Compound(compound)
-    }
-}
-
-pub trait IntoSketchActionResult {
-    fn into_result(self, sketch: &ISketch) -> StepResult;
-}
-
-impl<T: Into<SketchActionResult>> IntoSketchActionResult for T {
-    fn into_result(self, sketch: &ISketch) -> StepResult {
-        let faces = sketch.faces();
-        StepResult::SketchAction {
-            action: self.into(),
-            faces,
-        }
-    }
-}
diff --git a/packages/cadmium/src/workbench.rs b/packages/cadmium/src/workbench.rs
index 79471218..382a1f27 100644
--- a/packages/cadmium/src/workbench.rs
+++ b/packages/cadmium/src/workbench.rs
@@ -1,263 +1,549 @@
-use log::{debug, info};
 use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
+use tsify::Tsify;
 use wasm_bindgen::prelude::*;
 
-use crate::archetypes::{Plane, PlaneDescription};
+use crate::archetypes::{Plane, PlaneDescription, Point3, Vector3};
 use crate::error::CADmiumError;
-use crate::feature::point::Point3;
-use crate::feature::solid::Solid;
-use crate::feature::Feature;
-use crate::isketch::ISketch;
-use crate::step::{Step, StepHash, StepResult};
-use crate::IDType;
+use crate::extrusion::{fuse, Extrusion, ExtrusionMode};
+use crate::project::{RealPlane, RealSketch};
+use crate::realization::Realization;
+use crate::sketch::Sketch;
+use crate::solid::Solid;
+use crate::step::{Step, StepData};
 
-use crate::message::*;
+use std::collections::HashMap;
 
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::rc::Rc;
+// use truck_base::math::Vector3 as truck_vector3;
+use truck_shapeops::and as solid_and;
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[derive(Tsify, Debug, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Workbench {
-    pub name: String,
-    pub history: Vec<Rc<RefCell<Step>>>,
-
-    // These are free-standing points in 3D space, not part of sketches
-    pub points: BTreeMap<IDType, Rc<RefCell<Point3>>>,
-    pub points_next_id: IDType,
-
-    pub planes: BTreeMap<IDType, Rc<RefCell<Plane>>>,
-    pub planes_next_id: IDType,
-
-    pub sketches: BTreeMap<IDType, Rc<RefCell<ISketch>>>,
-    pub sketches_next_id: IDType,
-    pub features: BTreeMap<IDType, Rc<RefCell<Feature>>>,
-    pub features_next_id: IDType,
+    pub(crate) name: String,
+    pub(crate) history: Vec<Step>,
+    pub(crate) step_counters: HashMap<String, u64>,
 }
 
 impl Workbench {
     pub fn new(name: &str) -> Self {
-        info!("Creating new workbench: {}", name);
-        Workbench {
+        let mut wb = Workbench {
             name: name.to_owned(),
             history: vec![],
+            step_counters: HashMap::from([
+                ("Point".to_owned(), 0),
+                ("Plane".to_owned(), 0),
+                ("Sketch".to_owned(), 0),
+                ("Extrusion".to_owned(), 0),
+            ]),
+        };
+
+        wb.add_point("Origin", Point3::new(0.0, 0.0, 0.0));
+        wb.add_plane("Front", Plane::front());
+        wb.add_plane("Right", Plane::right());
+        wb.add_plane("Top", Plane::top());
+
+        wb
+    }
 
-            points: BTreeMap::new(),
-            points_next_id: 0,
-            planes: BTreeMap::new(),
-            planes_next_id: 0,
-
-            sketches: BTreeMap::new(),
-            sketches_next_id: 0,
-            features: BTreeMap::new(),
-            features_next_id: 0,
+    pub fn get_first_plane_id(&self) -> Option<String> {
+        for step in self.history.iter() {
+            match &step.data {
+                StepData::Plane {
+                    plane: _,
+                    width: _,
+                    height: _,
+                } => {
+                    return Some(step.unique_id.clone());
+                }
+                _ => {}
+            }
         }
+        None
     }
 
-    pub fn get_first_plane_id(&self) -> Option<IDType> {
-        if !self.planes.is_empty() {
-            Some(self.planes.keys().next().unwrap().to_owned())
-        } else {
-            None
+    pub fn update_step_data(&mut self, step_id: &str, new_step_data: StepData) {
+        let mut index = 0;
+        for step in self.history.iter() {
+            if step.unique_id == step_id {
+                break;
+            }
+            index += 1;
         }
+
+        self.history[index].data = new_step_data;
     }
 
-    pub fn get_last_plane_id(&self) -> Option<IDType> {
-        if !self.planes.is_empty() {
-            Some(self.planes.keys().last().unwrap().to_owned())
-        } else {
-            None
+    pub fn last_plane_id(&self) -> Option<String> {
+        let mut last_plane_id = None;
+        for step in self.history.iter() {
+            match &step.data {
+                StepData::Plane {
+                    plane: _,
+                    width: _,
+                    height: _,
+                } => {
+                    last_plane_id = Some(step.unique_id.clone());
+                }
+                _ => {}
+            }
         }
+        last_plane_id
     }
 
-    pub fn get_sketch_by_id(&self, id: IDType) -> Result<Rc<RefCell<ISketch>>, CADmiumError> {
-        self.sketches
-            .get(&id)
-            .ok_or(CADmiumError::SketchIDNotFound(id))
-            .cloned()
+    pub fn json(&self) -> String {
+        let result = serde_json::to_string(self);
+        match result {
+            Ok(json) => json,
+            Err(e) => format!("Error: {}", e),
+        }
     }
 
-    pub fn add_message_step(&mut self, message: &Message, node: StepResult) {
+    pub fn get_step_mut(&mut self, name: &str) -> Result<&mut Step, CADmiumError> {
         self.history
-            .push(Rc::new(RefCell::new(Step::new(message.clone(), node))));
+            .iter_mut()
+            .find(|step| step.name == name)
+            .ok_or(CADmiumError::StepNameNotFound(name.to_string()))
     }
 
-    pub fn get_step_by_hash(&self, hash: StepHash) -> Option<Rc<RefCell<Step>>> {
-        debug!(
-            "Looking for step with hash {} in hashes {:?}",
-            hash,
-            self.history
-                .iter()
-                .map(|step| step.borrow().hash())
-                .collect::<Vec<_>>()
-        );
+    pub fn get_step_by_id_mut(&mut self, id: &str) -> Result<&mut Step, CADmiumError> {
         self.history
-            .iter()
-            .find(|step| step.borrow().hash() == hash)
-            .cloned()
+            .iter_mut()
+            .find(|step| step.unique_id == id)
+            .ok_or(CADmiumError::StepIDNotFound(id.to_string()))
     }
 
-    // TODO: Remove
-    pub fn get_solids(&self) -> Vec<Solid> {
-        self.features
-            .values()
-            .map(|feature| feature.borrow().as_solid_like().to_solids().unwrap())
-            .flatten()
-            .collect()
+    pub fn get_sketch_mut(&mut self, name: &str) -> Result<&mut Sketch, CADmiumError> {
+        let step = self.get_step_mut(name)?;
+
+        match step.data {
+            StepData::Sketch { ref mut sketch, .. } => Ok(sketch),
+            _ => Err(CADmiumError::IncorrectStepDataType(step.unique_id.clone())),
+        }
     }
-}
 
-impl Identifiable for Rc<RefCell<Workbench>> {
-    type Parent = crate::project::Project;
-    const ID_NAME: &'static str = "workbench_id";
+    pub fn get_sketch_by_id_mut(&mut self, id: &str) -> Result<&mut Sketch, CADmiumError> {
+        let step = self.get_step_by_id_mut(id)?;
 
-    fn from_parent_id(parent: &crate::project::Project, hash: StepHash) -> anyhow::Result<Self> {
-        // For now at least there's no good way to differentiate between a workbench
-        // ID and a step hash. The workbench can't be hash-indexed as it's always
-        // changing
-        let id = hash.into_int();
-        Ok(parent.get_workbench_by_id(id)?)
+        match step.data {
+            StepData::Sketch { ref mut sketch, .. } => Ok(sketch),
+            _ => Err(CADmiumError::IncorrectStepDataType(step.unique_id.clone())),
+        }
     }
-}
-
-// Add to history any messages that have Workbench as the parent
-// impl<T> MessageHandler for IDWrap<T>
-// where
-//     T: MessageHandler<Parent = Rc<RefCell<Workbench>>> + Serialize + for<'de> Deserialize<'de> + wasm_bindgen::convert::RefFromWasmAbi
-// {
-//     type Parent = Rc<RefCell<Workbench>>;
-//     fn handle_message(&self, workbench_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
-//         let mut workbench = workbench_ref.borrow_mut();
-//         workbench.add_message_step(&self);
-//         self.handle_message(workbench_ref)
-//     }
-
-// }
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddPoint {
-    pub x: f64,
-    pub y: f64,
-    pub z: f64,
-}
 
-impl MessageHandler for AddPoint {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut wb = sketch_ref.borrow_mut();
-
-        let new_id = wb.points_next_id;
-        let point = Rc::new(RefCell::new(Point3::new(self.x, self.y, self.z)));
-        wb.points.insert(new_id, point.clone());
-        wb.points_next_id += 1;
-        Ok(Some((new_id, StepResult::Point(point))))
+    pub fn add_point(&mut self, name: &str, point: Point3) {
+        let counter = self.step_counters.get_mut("Point").unwrap();
+        self.history.push(Step::new_point(name, point, *counter));
+        *counter += 1;
     }
-}
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddPlane {
-    pub plane: Plane,
-    pub width: f64,
-    pub height: f64,
-}
+    pub fn add_plane(&mut self, name: &str, plane: Plane) -> String {
+        let counter = self.step_counters.get_mut("Plane").unwrap();
+        self.history.push(Step::new_plane(name, plane, *counter));
+        *counter += 1;
 
-impl MessageHandler for AddPlane {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        sketch_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut wb = sketch_ref.borrow_mut();
-
-        let new_id = wb.planes_next_id;
-        let plane = Rc::new(RefCell::new(self.plane.clone()));
-        wb.planes.insert(new_id, plane.clone());
-        wb.planes_next_id += 1;
-        Ok(Some((new_id, StepResult::Plane(plane))))
+        self.plane_name_to_id(name).unwrap()
     }
-}
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddSketch {
-    pub plane_description: PlaneDescription,
-}
+    pub fn plane_name_to_id(&self, plane_name: &str) -> Option<String> {
+        for step in self.history.iter() {
+            if step.name == plane_name {
+                match &step.data {
+                    StepData::Plane {
+                        plane: _,
+                        width: _,
+                        height: _,
+                    } => {
+                        return Some(step.unique_id.clone());
+                    }
+                    _ => {}
+                }
+            }
+        }
+        None
+    }
 
-impl MessageHandler for AddSketch {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        workbench_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut wb = workbench_ref.borrow_mut();
-        let sketch = ISketch::try_from_plane_description(&wb, &self.plane_description)?;
-
-        let new_id = wb.sketches_next_id;
-        let sketch_cell = Rc::new(RefCell::new(sketch));
-        wb.sketches.insert(new_id, sketch_cell.clone());
-        wb.sketches_next_id += 1;
-        Ok(Some((new_id, StepResult::Sketch(sketch_cell.clone()))))
+    pub fn add_sketch_to_solid_face(
+        &mut self,
+        new_sketch_name: &str,
+        solid_id: &str,
+        normal: Vector3,
+    ) -> String {
+        // TODO: maybe this shouldn't just take in a normal. Maybe it should take in the o, p, q points as well
+        // that way it could try to match even if there are multiple faces on this solid which have the same normal vector
+        // println!("New Normal! {:?}", normal);
+        // called like: wb.add_sketch_to_solid_face("Sketch-2", "Ext1:0", Vector3::new(0.0, 0.0, 1.0));
+
+        let counter = self.step_counters.get_mut("Sketch").unwrap();
+        let new_step = Step::new_sketch_on_solid_face(&new_sketch_name, solid_id, normal, *counter);
+        let new_step_id = new_step.unique_id.clone();
+        self.history.push(new_step);
+        *counter += 1;
+
+        new_step_id
     }
-}
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct WorkbenchRename {
-    pub new_name: String,
-}
+    pub fn add_sketch_to_plane(&mut self, name: &str, plane_id: &str) -> String {
+        if plane_id != "" {
+            // if the plane id is specified, check to make sure a plane with that ID exists
+            let mut plane_exists = false;
+            for step in self.history.iter() {
+                if step.unique_id == plane_id {
+                    match &step.data {
+                        StepData::Plane {
+                            plane: _,
+                            width: _,
+                            height: _,
+                        } => {
+                            plane_exists = true;
+                        }
+                        _ => {}
+                    }
+                }
+            }
+
+            if !plane_exists {
+                return format!("failed to find plane with id {}", plane_id);
+            }
+        }
+        // if the plane id is empty string, that's okay it's a placeholder
+
+        // If the sketch name is empty string, then we need to generate a new name
+        // Let's use "Sketch n" where n is the number of sketches
+        let counter = self.step_counters.get_mut("Sketch").unwrap();
+        let sketch_name = if name == "" {
+            format!("Sketch {}", *counter + 1)
+        } else {
+            name.to_owned()
+        };
 
-impl MessageHandler for WorkbenchRename {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        workbench_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let mut workbench = workbench_ref.borrow_mut();
-        workbench.name = self.new_name.clone();
-        Ok(None)
+        let new_step = Step::new_sketch(&sketch_name, &plane_id, *counter);
+        let new_step_id = new_step.unique_id.clone();
+        self.history.push(new_step);
+        *counter += 1;
+
+        new_step_id
     }
-}
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct SetSketchPlane {
-    pub sketch_id: IDType,
-    pub plane_description: PlaneDescription,
-}
+    pub fn add_extrusion(&mut self, name: &str, extrusion: Extrusion) -> u64 {
+        // If the extrusion name is empty string, then we need to generate a new name
+        // Let's use "Extrusion n" where n is the number of extrusions
+        let counter = self.step_counters.get_mut("Extrusion").unwrap();
+        let extrusion_name = if name == "" {
+            format!("Extrusion {}", *counter + 1)
+        } else {
+            name.to_owned()
+        };
+        self.history
+            .push(Step::new_extrusion(&extrusion_name, extrusion, *counter));
+        *counter += 1;
+        *counter - 1
+    }
 
-impl MessageHandler for SetSketchPlane {
-    type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(
-        &self,
-        workbench_ref: Self::Parent,
-    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
-        let wb = workbench_ref.borrow();
-
-        let plane = match self.plane_description {
-            PlaneDescription::PlaneId(plane_id) => wb
-                .planes
-                .get(&plane_id)
-                .ok_or(anyhow::anyhow!("Failed to find plane with id {}", plane_id))?,
-            PlaneDescription::SolidFace {
-                solid_id: _,
-                normal: _,
-            } => todo!("Implement SolidFace"),
+    pub fn realize(&self, max_steps: u64) -> Realization {
+        let mut realized = Realization::new();
+        let max_steps = max_steps as usize; // just coerce the type once
+
+        for (step_n, step) in self.history.iter().enumerate() {
+            // println!("{:?}", step.name);
+            if step_n >= max_steps {
+                break;
+            }
+
+            let step_data = &step.data;
+            // println!("{:?}", step_data);
+            match step_data {
+                StepData::Point { point } => {
+                    realized
+                        .points
+                        .insert(step.unique_id.to_owned(), point.clone());
+                }
+                StepData::Plane {
+                    plane,
+                    width,
+                    height,
+                } => {
+                    let rp = RealPlane {
+                        plane: plane.clone(),
+                        width: *width,
+                        height: *height,
+                        name: step.name.clone(),
+                    };
+                    realized.planes.insert(step.unique_id.to_owned(), rp);
+                }
+                StepData::Sketch {
+                    width: _,
+                    height: _,
+                    plane_description,
+                    sketch,
+                } => match plane_description {
+                    PlaneDescription::PlaneId(plane_id) => {
+                        if plane_id == "" {
+                            println!("Sketch {} has no plane", step.name);
+                            continue;
+                        }
+
+                        let plane = &realized.planes[plane_id];
+
+                        realized.sketches.insert(
+                            step.unique_id.to_owned(),
+                            (
+                                RealSketch::new(&plane.name, plane_id, plane, sketch),
+                                RealSketch::new(
+                                    &plane.name,
+                                    plane_id,
+                                    plane,
+                                    &sketch.split_intersections(false),
+                                ),
+                                step.name.clone(),
+                            ),
+                        );
+                    }
+                    PlaneDescription::SolidFace { solid_id, normal } => {
+                        let solid = &realized.solids[solid_id];
+                        let face = solid.get_face_by_normal(normal).unwrap();
+                        let oriented_surface = face.oriented_surface();
+
+                        println!("Surface: {:?}", oriented_surface);
+                        let sketch_plane;
+                        match oriented_surface {
+                            truck_modeling::geometry::Surface::Plane(p) => {
+                                let plane = Plane::from_truck(p);
+                                println!("Plane: {:?}", plane);
+                                sketch_plane = plane;
+                            }
+                            _ => {
+                                panic!("I only know how to put sketches on planes");
+                            }
+                        }
+
+                        let new_plane_id = format!("derived_plane_for:{}", step.name);
+
+                        let rp = RealPlane {
+                            plane: sketch_plane.clone(),
+                            width: 90.0,
+                            height: 60.0,
+                            name: new_plane_id.clone(),
+                        };
+                        realized.planes.insert(new_plane_id.clone(), rp);
+                        let rp = &realized.planes[&new_plane_id];
+
+                        realized.sketches.insert(
+                            step.unique_id.to_owned(),
+                            (
+                                RealSketch::new(&new_plane_id, &new_plane_id, &rp, sketch),
+                                RealSketch::new(
+                                    &new_plane_id,
+                                    &new_plane_id,
+                                    &rp,
+                                    &sketch.split_intersections(false),
+                                ),
+                                step.name.clone(),
+                            ),
+                        );
+                    }
+                },
+                StepData::Extrusion { extrusion } => {
+                    let (_sketch, split_sketch, _name) = &realized.sketches[&extrusion.sketch_id];
+                    let plane = &realized.planes[&split_sketch.plane_id];
+
+                    match &extrusion.mode {
+                        ExtrusionMode::New => {
+                            // if this extrusion is in mode "New" then this old behavior is correct!
+
+                            let solids = Solid::from_extrusion(
+                                step.name.clone(),
+                                plane,
+                                split_sketch,
+                                extrusion,
+                            );
+
+                            for (name, solid) in solids {
+                                realized.solids.insert(name, solid);
+                            }
+                        }
+                        ExtrusionMode::Add(merge_scope) => {
+                            // if this extrusion is in mode "Add" Then we need to merge the resulting solids
+                            // with each of the solids listed in the merge scope
+
+                            let new_solids = Solid::from_extrusion(
+                                step.name.clone(),
+                                plane,
+                                split_sketch,
+                                extrusion,
+                            );
+
+                            // NO LONGER NEEDED
+                            // // this is some bullshit, but bear with me. To make the solids merge properly we need to
+                            // // lengthen the extrusion a tiny bit, basically build in some buffer
+                            // let mut longer_extrusion = extrusion.clone();
+                            // longer_extrusion.length += 0.001;
+                            // longer_extrusion.offset -= 0.001;
+                            // let solids = Solid::from_extrusion(
+                            //     step.name.clone(),
+                            //     plane,
+                            //     split_sketch,
+                            //     &longer_extrusion,
+                            // );
+
+                            for existing_solid_name in merge_scope {
+                                let mut existing_solid_to_merge_with =
+                                    realized.solids.remove(existing_solid_name).unwrap();
+
+                                // merge this existing solid with as many of the new solids as possible
+                                for (_, new_solid) in new_solids.iter() {
+                                    // let new_candidate = translated(
+                                    //     &solid.truck_solid,
+                                    //     TruckVector3::new(0.0, 0.0, 1.0),
+                                    // );
+                                    // println!("\nTranslated new candidate: {:?}", new_candidate);
+
+                                    // let result =
+                                    //     solid_or(&existing_solid.truck_solid, &new_candidate, 0.1);
+
+                                    let fused = fuse(
+                                        &existing_solid_to_merge_with.truck_solid,
+                                        &new_solid.truck_solid,
+                                    );
+
+                                    match fused {
+                                        Some(s) => {
+                                            existing_solid_to_merge_with = Solid::from_truck_solid(
+                                                existing_solid_name.to_owned(),
+                                                s,
+                                            );
+                                        }
+                                        None => {
+                                            println!("Failed to merge with OR");
+                                        }
+                                    }
+                                }
+
+                                realized.solids.insert(
+                                    existing_solid_name.to_owned(),
+                                    existing_solid_to_merge_with,
+                                );
+                            }
+                        }
+
+                        ExtrusionMode::Remove(merge_scope) => {
+                            // If this extrusion is in mode "Remove" then we need to subtract the resulting solid
+                            // with each of the solids listed in the merge scope
+                            println!("Okay, let's remove");
+                            let new_solids = Solid::from_extrusion(
+                                step.name.clone(),
+                                plane,
+                                split_sketch,
+                                extrusion,
+                            );
+
+                            for existing_solid_name in merge_scope {
+                                let mut existing_solid_to_merge_with =
+                                    realized.solids.remove(existing_solid_name).unwrap();
+
+                                // merge this existing solid with as many of the new solids as possible
+                                for (_, new_solid) in new_solids.iter() {
+                                    // let translated_solid = translated(
+                                    //     &solid.truck_solid,
+                                    //     TruckVector3::new(0.0, 0.0, 1.0),
+                                    // );
+                                    // println!("\nTranslated new candidate: {:?}", new_candidate);
+
+                                    // let result =
+                                    //     solid_or(&existing_solid.truck_solid, &new_candidate, 0.1);
+
+                                    let punch = new_solid.truck_solid.clone();
+                                    // punch.not();
+                                    println!("Have a punch");
+
+                                    let cleared = solid_and(
+                                        &existing_solid_to_merge_with.truck_solid,
+                                        &punch,
+                                        0.1,
+                                    );
+
+                                    println!("have cleared");
+
+                                    match cleared {
+                                        Some(s) => {
+                                            println!("Merged with AND");
+                                            // println!("{:?}", s);
+                                            existing_solid_to_merge_with = Solid::from_truck_solid(
+                                                existing_solid_name.to_owned(),
+                                                s,
+                                            );
+                                        }
+                                        None => {
+                                            println!("Failed to merge with AND");
+                                        }
+                                    }
+                                }
+
+                                realized.solids.insert(
+                                    existing_solid_name.to_owned(),
+                                    existing_solid_to_merge_with,
+                                );
+                                println!("inserted the solid back in")
+                            }
+                        }
+                    }
+                }
+            }
         }
-        .clone();
 
-        let sketch = wb.sketches.get(&self.sketch_id).ok_or(anyhow::anyhow!(
-            "Failed to find sketch with id {}",
-            self.sketch_id
-        ))?;
-        sketch.borrow_mut().plane = plane;
+        realized
+    }
+}
+
+#[cfg(test)]
+pub mod tests {
+    use crate::extrusion::Direction;
+
+    use super::*;
+
+    #[test]
+    fn make_empty_workbench() {
+        let wb = Workbench::new("Test Workbench");
+        assert_eq!(wb.history.len(), 4);
+        assert_eq!(wb.get_first_plane_id().unwrap(), "Plane-0".to_owned());
+        assert_eq!(wb.last_plane_id().unwrap(), "Plane-2".to_owned());
+        assert_eq!(wb.plane_name_to_id("Front").unwrap(), "Plane-0".to_owned());
+        assert_eq!(wb.plane_name_to_id("Right").unwrap(), "Plane-1".to_owned());
+        assert_eq!(wb.plane_name_to_id("Top").unwrap(), "Plane-2".to_owned());
+
+        let realization = wb.realize(1000);
+        assert_eq!(realization.points.len(), 1); //origin
+        assert_eq!(realization.planes.len(), 3); // origin, front, right, top
+        assert_eq!(realization.sketches.len(), 0);
+        assert_eq!(realization.solids.len(), 0);
+    }
+
+    #[test]
+    fn make_and_workbench_with_extrusion() {
+        let mut wb = Workbench::new("Test Workbench");
+        wb.add_sketch_to_plane("Sketch 1", "Plane-0");
+        let s = wb.get_sketch_mut("Sketch 1").unwrap();
+        let ll = s.add_point(0.0, 0.0);
+        let lr = s.add_point(40.0, 0.0);
+        let ul = s.add_point(0.0, 40.0);
+        let ur = s.add_point(40.0, 40.0);
+        s.add_segment(ll, lr);
+        s.add_segment(lr, ur);
+        s.add_segment(ur, ul);
+        s.add_segment(ul, ll);
+
+        let extrusion = Extrusion::new(
+            "Sketch-0".to_owned(),
+            vec![0],
+            25.0,
+            0.0,
+            Direction::Normal,
+            ExtrusionMode::New,
+        );
+        wb.add_extrusion("Ext1", extrusion);
 
-        Ok(None)
+        let realization = wb.realize(1000);
+        assert_eq!(realization.planes.len(), 3);
+        assert_eq!(realization.sketches.len(), 1);
+        assert_eq!(realization.solids.len(), 1);
     }
 }
diff --git a/packages/shared/cadmium-api.ts b/packages/shared/cadmium-api.ts
deleted file mode 100644
index ca4c9dc9..00000000
--- a/packages/shared/cadmium-api.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// This file is generated by the gen-types binary, do not edit
-import { Direction, IDType, MessageResult, Mode, Plane, PlaneDescription, StepHash } from "cadmium"
-import { sendWasmMessage } from "./projectUtils"
-
-export interface ProjectRename { new_name: string;  }
-export function projectRename(new_name: string): MessageResult {
-    const message: Message = { type: "ProjectRename", new_name };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchRename { workbench_id: StepHash; new_name: string;  }
-export function workbenchRename(workbench_id: StepHash, new_name: string): MessageResult {
-    const message: Message = { type: "WorkbenchRename", workbench_id, new_name };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchPointAdd { workbench_id: StepHash; x: number; y: number; z: number;  }
-export function workbenchPointAdd(workbench_id: StepHash, x: number, y: number, z: number): MessageResult {
-    const message: Message = { type: "WorkbenchPointAdd", workbench_id, x, y, z };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchPlaneAdd { workbench_id: StepHash; plane: Plane; width: number; height: number;  }
-export function workbenchPlaneAdd(workbench_id: StepHash, plane: Plane, width: number, height: number): MessageResult {
-    const message: Message = { type: "WorkbenchPlaneAdd", workbench_id, plane, width, height };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchSketchAdd { workbench_id: StepHash; plane_description: PlaneDescription;  }
-export function workbenchSketchAdd(workbench_id: StepHash, plane_description: PlaneDescription): MessageResult {
-    const message: Message = { type: "WorkbenchSketchAdd", workbench_id, plane_description };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchSketchSetPlane { workbench_id: StepHash; sketch_id: IDType; plane_description: PlaneDescription;  }
-export function workbenchSketchSetPlane(workbench_id: StepHash, sketch_id: IDType, plane_description: PlaneDescription): MessageResult {
-    const message: Message = { type: "WorkbenchSketchSetPlane", workbench_id, sketch_id, plane_description };
-    return sendWasmMessage(message);
-}
-
-export interface WorkbenchPointUpdate { workbench_id: StepHash; point_id: StepHash; x: number; y: number; z: number;  }
-export function workbenchPointUpdate(workbench_id: StepHash, point_id: StepHash, x: number, y: number, z: number): MessageResult {
-    const message: Message = { type: "WorkbenchPointUpdate", workbench_id, point_id, x, y, z };
-    return sendWasmMessage(message);
-}
-
-export interface SketchAddPoint { workbench_id: StepHash; sketch_id: StepHash; x: number; y: number;  }
-export function sketchAddPoint(workbench_id: StepHash, sketch_id: StepHash, x: number, y: number): MessageResult {
-    const message: Message = { type: "SketchAddPoint", workbench_id, sketch_id, x, y };
-    return sendWasmMessage(message);
-}
-
-export interface SketchAddArc { workbench_id: StepHash; sketch_id: StepHash; center: StepHash; radius: number; clockwise: boolean; start_angle: number; end_angle: number;  }
-export function sketchAddArc(workbench_id: StepHash, sketch_id: StepHash, center: StepHash, radius: number, clockwise: boolean, start_angle: number, end_angle: number): MessageResult {
-    const message: Message = { type: "SketchAddArc", workbench_id, sketch_id, center, radius, clockwise, start_angle, end_angle };
-    return sendWasmMessage(message);
-}
-
-export interface SketchAddCircle { workbench_id: StepHash; sketch_id: StepHash; center: StepHash; radius: number;  }
-export function sketchAddCircle(workbench_id: StepHash, sketch_id: StepHash, center: StepHash, radius: number): MessageResult {
-    const message: Message = { type: "SketchAddCircle", workbench_id, sketch_id, center, radius };
-    return sendWasmMessage(message);
-}
-
-export interface SketchAddLine { workbench_id: StepHash; sketch_id: StepHash; start: StepHash; end: StepHash;  }
-export function sketchAddLine(workbench_id: StepHash, sketch_id: StepHash, start: StepHash, end: StepHash): MessageResult {
-    const message: Message = { type: "SketchAddLine", workbench_id, sketch_id, start, end };
-    return sendWasmMessage(message);
-}
-
-export interface SketchAddRectangle { workbench_id: StepHash; sketch_id: StepHash; start: IDType; end: IDType;  }
-export function sketchAddRectangle(workbench_id: StepHash, sketch_id: StepHash, start: IDType, end: IDType): MessageResult {
-    const message: Message = { type: "SketchAddRectangle", workbench_id, sketch_id, start, end };
-    return sendWasmMessage(message);
-}
-
-export interface SketchDeletePrimitive { workbench_id: StepHash; sketch_id: StepHash; id: IDType;  }
-export function sketchDeletePrimitive(workbench_id: StepHash, sketch_id: StepHash, id: IDType): MessageResult {
-    const message: Message = { type: "SketchDeletePrimitive", workbench_id, sketch_id, id };
-    return sendWasmMessage(message);
-}
-
-export interface FeatureExtrusionAdd { workbench_id: StepHash; sketch_id: StepHash; faces: IDType[]; length: number; offset: number; direction: Direction; mode: Mode;  }
-export function featureExtrusionAdd(workbench_id: StepHash, sketch_id: StepHash, faces: IDType[], length: number, offset: number, direction: Direction, mode: Mode): MessageResult {
-    const message: Message = { type: "FeatureExtrusionAdd", workbench_id, sketch_id, faces, length, offset, direction, mode };
-    return sendWasmMessage(message);
-}
-
-export interface StepRename { workbench_id: StepHash; step_id: StepHash; new_name: string;  }
-export function stepRename(workbench_id: StepHash, step_id: StepHash, new_name: string): MessageResult {
-    const message: Message = { type: "StepRename", workbench_id, step_id, new_name };
-    return sendWasmMessage(message);
-}
-
-export interface StepDelete { workbench_id: StepHash; step_id: IDType;  }
-export function stepDelete(workbench_id: StepHash, step_id: IDType): MessageResult {
-    const message: Message = { type: "StepDelete", workbench_id, step_id };
-    return sendWasmMessage(message);
-}
-export type Message = { type: "ProjectRename" } & ProjectRename | { type: "WorkbenchRename" } & WorkbenchRename | { type: "WorkbenchPointAdd" } & WorkbenchPointAdd | { type: "WorkbenchPlaneAdd" } & WorkbenchPlaneAdd | { type: "WorkbenchSketchAdd" } & WorkbenchSketchAdd | { type: "WorkbenchSketchSetPlane" } & WorkbenchSketchSetPlane | { type: "WorkbenchPointUpdate" } & WorkbenchPointUpdate | { type: "SketchAddPoint" } & SketchAddPoint | { type: "SketchAddArc" } & SketchAddArc | { type: "SketchAddCircle" } & SketchAddCircle | { type: "SketchAddLine" } & SketchAddLine | { type: "SketchAddRectangle" } & SketchAddRectangle | { type: "SketchDeletePrimitive" } & SketchDeletePrimitive | { type: "FeatureExtrusionAdd" } & FeatureExtrusionAdd | { type: "StepRename" } & StepRename | { type: "StepDelete" } & StepDelete;
diff --git a/packages/shared/isotope.d.ts b/packages/shared/isotope.d.ts
deleted file mode 100644
index 314f378c..00000000
--- a/packages/shared/isotope.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {IDType} from "cadmium"
-
-export interface Sketch {
-  primitives: SketchPrimitive[]
-  primitive_next_id: number
-  constraints: SketchConstraint[]
-}
-
-export type SketchPrimitive = {Point2: Point2} | {Line: Line} | {Circle: Circle} | {Arc: Arc}
-
-export interface Point2 {
-  x: number
-  y: number
-}
-
-export interface Line {
-  start: IDType
-  end: IDType
-}
-
-export interface Circle {
-  center: IDType
-  radius: number
-}
-
-export interface Arc {
-  center: IDType
-  radius: number
-  start_angle: number
-  end_angle: number
-  clockwise: boolean
-}
-
-// TODO: Constraints
-export type SketchConstraint = {}
diff --git a/packages/shared/projectUtils.ts b/packages/shared/projectUtils.ts
index dccf686c..bf0ab47d 100644
--- a/packages/shared/projectUtils.ts
+++ b/packages/shared/projectUtils.ts
@@ -1,58 +1,65 @@
-import type {Message} from "./cadmium-api"
-
-import {workbenchIsStale, workbenchIndex, workbench, project, featureIndex, wasmProject, projectIsStale, messageHistory, workbenchSolids} from "./stores"
+import {
+  workbenchIsStale,
+  workbenchIndex,
+  workbench,
+  project,
+  featureIndex,
+  wasmProject,
+  projectIsStale,
+  realizationIsStale,
+  wasmRealization,
+  realization,
+  messageHistory,
+} from "./stores"
 import {get} from "svelte/store"
 import {Vector2, Vector3, type Vector2Like} from "three"
-import type {Entity, MessageHistory, WithTarget} from "./types"
-import type {Workbench, MessageResult, Solid, Step, Point3, Plane, ISketch, StepHash} from "cadmium"
-import {isSketchActionStep} from "./stepTypeGuards"
-import {isMessage} from "./typeGuards"
-
-import * as cad from "./cadmium-api"
-(window as any).cad = cad
-export { cad }
+import type {
+  Entity,
+  ExtrusionHistoryStep,
+  HistoryStep,
+  MessageHistory,
+  PlaneHistoryStep,
+  PointHistoryStep,
+  Point2D,
+  SketchHistoryStep,
+  WithTarget,
+  WorkBench,
+} from "./types"
+import type {Realization as WasmRealization, Message} from "cadmium"
+import {
+  isDeleteArcs,
+  isDeleteCircles,
+  isDeleteLines,
+  isNewCircleBetweenPoints,
+  isNewExtrusion,
+  isNewLineOnSketch,
+  isNewPointOnSketch2,
+  isNewRectangleBetweenPoints,
+  isNewSketchOnPlane,
+  isRenameProject,
+  isRenameStep,
+  isRenameWorkbench,
+  isSetSketchPlane,
+  isUpdateExtrusion,
+} from "./typeGuards"
+// import { isDevelopment } from "../+layout"
 
 // prettier-ignore
 const log = (function () { const context = "[projectUtils.ts]"; const color = "aqua"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`) })()
 
 export const CIRCLE_TOLERANCE = 0.05
 
-function createWrapperFunctions(originalNamespace: any, newNamespace: any) {
-  Object.keys(originalNamespace).forEach(funcName => {
-    const originalFunction = originalNamespace[funcName]
-    if (typeof originalFunction === "function") {
-      newNamespace[funcName] = (...args: any[]) => {
-        const workbench_id = get(workbenchIndex)
-        return originalFunction(workbench_id.toString(), ...args)
-      }
-    }
-  })
-}
-
-export namespace bench {
-  createWrapperFunctions(cad, bench)
-}
-(window as any).bench = bench
-
-export function getWorkbenchSolids(): Solid[] {
-  let wp = get(wasmProject)
-  return wp.get_workbench_solids(get(workbenchIndex))
-}
-
-export function isPoint(node: Node): node is Node & Point3 {
-  // const typedObj = node as Point3
-  // return typedObj.x !== undefined && typedObj.y !== undefined && typedObj.z !== undefined
-  return "Point" in node
+export function isPoint(feature: HistoryStep): feature is PointHistoryStep {
+  return feature.data.type === "Point"
 }
-export function isPlane(node: Node): node is Node & Plane {
-  return "Plane" in node
+export function isPlane(feature: HistoryStep): feature is PlaneHistoryStep {
+  return feature.data.type === "Plane"
 }
-export type SketchStep = Step & {result: ISketch, data: cad.WorkbenchSketchAdd }
-export function isSketchStep(step: Step): step is SketchStep {
-  return "WorkbenchSketchAdd" in step.data && "Sketch" in step.result
+export function isExtrusion(feature: HistoryStep): feature is ExtrusionHistoryStep {
+  return feature.data.type === "Extrusion"
 }
-export function isSolid(node: Node): node is Node & Solid[] {
-  return "Solid" in node
+export function isSketch(feature: HistoryStep): feature is SketchHistoryStep {
+  return feature.data.type === "Sketch"
 }
 
 export function arraysEqual(a: any[], b: any[]) {
@@ -63,28 +70,20 @@ export function arraysEqual(a: any[], b: any[]) {
   return true
 }
 
-export function sendWasmMessage(message: Message): MessageResult {
+function sendWasmMessage(message: Message) {
   let wp = get(wasmProject)
   log("[sendWasmMessage] sending message:", message)
-  // TODO: send_message should accept the generated Message type (cadmium-api.ts), not the cadmium Message type
-  let result = wp.send_message(message as any)
+  let result = wp.send_message(message)
   log("[sendWasmMessage] reply:", result)
 
   messageHistory.update((history: MessageHistory[]) => {
     log("[sendWasmMessage] [messageHistory.update] update:", {message, result})
     return [...history, {message, result}]
   })
-
-  if (!result.success) {
-    throw new Error(`[sendWasmMessage] message failed: ${result.data}`)
-  } else {
-    workbenchIsStale.set(true)
-  }
-
   return result
 }
 
-export function updateExtrusion(extrusionId: number, sketchId: number, length: number, faceIds: string[]) {
+export function updateExtrusion(extrusionId: string, sketchId: string, length: number, faceIds: string[]) {
   const message: Message = {
     UpdateExtrusion: {
       workbench_id: get(workbenchIndex),
@@ -114,68 +113,239 @@ export function updateExtrusion(extrusionId: number, sketchId: number, length: n
   // workbenchIsStale.set(true)
 }
 
-export function setSketchPlane(sketchId: number, planeId: number) {
-  return cad.workbenchSketchSetPlane(get(workbenchIndex).toString(), sketchId, {PlaneId: planeId})
+export function setSketchPlane(sketchId: string, planeId: string) {
+  const message: Message = {
+    SetSketchPlane: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchId,
+      plane_id: planeId,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
 export function newSketchOnPlane() {
-  // TODO: Why are we defaulting to plane 0?
-  cad.workbenchSketchAdd(get(workbenchIndex).toString(), {PlaneId: 0})
+  const message: Message = {
+    NewSketchOnPlane: {
+      workbench_id: get(workbenchIndex),
+      plane_id: "", // leave it floating at first
+      sketch_name: "", // a sensible name will be generated by the rust code
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
 export function newExtrusion() {
-  const bench: Workbench = get(workbench)
+  const bench: WorkBench = get(workbench)
   // log("[newExtrusion] workbench:", workbench)
   // log("[newExtrusion] bench:", bench)
 
-  let faces: number[] = []
-  for (let step of bench.history.reverse()) {
-    console.warn("[newExtrusion] step:", step)
-    if (isSketchActionStep(step) && faces.length === 0) {
-      faces = Array.from({ length: step.result.faces.length }, (_value, index) => index);
-      console.log("[newExtrusion] faces:", faces)
-      return cad.featureExtrusionAdd(get(workbenchIndex).toString(), step.data.sketch_id, faces, 25, 0.0, "Normal", "New")
+  let sketchId = null
+  for (let step of bench.history) {
+    if (step.data.type === "Sketch") {
+      sketchId = step.unique_id
     }
   }
+  if (sketchId === null) {
+    log("No sketch found in history")
+    return
+  }
 
-  throw new Error("No sketch faces found to extrude")
+  const message: Message = {
+    NewExtrusion: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchId,
+      face_ids: [],
+      length: 25,
+      offset: 0.0,
+      extrusion_name: "",
+      direction: "Normal",
+    },
+  }
+
+  // we check for face_ids: [] to contain numbers but we send an empty array
+  // todo: maybe change isNewExtrusion? although with the rust api it is possible to send an array of faceids so we ought to check them...
+  // probably best to alter isNewExtrusion to allow an empty array or a number[]
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
 export function deleteEntities(sketchIdx: string, selection: Entity[]) {
-  const workbenchIdx = get(workbenchIndex).toString()
+  const workbenchIdx = get(workbenchIndex)
+
+  // log("[deleteEntities]", "sketchIdx:", sketchIdx, "selection:", selection, "workbenchIdx:", workbenchIdx, "sketchIdx:", sketchIdx, "selection:", selection)
+  const lines = selection.filter(e => e.type === "line")
+  const arcs = selection.filter(e => e.type === "arc")
+  const circles = selection.filter(e => e.type === "circle")
+  // const points = selection.filter((e) => e.type === 'point')
+
+  const lineIds = reduceToInts(
+    lines.map(e => e.id),
+    (id: any) => console.error(`[deleteEntities] line id is not an int: ${id}`),
+  )
+  const arcIds = reduceToInts(
+    arcs.map(e => e.id),
+    (id: any) => console.error(`[deleteEntities] arc id is not an int: ${id}`),
+  )
+  const circleIds = reduceToInts(
+    circles.map(e => e.id),
+    (id: any) => console.error(`[deleteEntities] circle id is not an int: ${id}`),
+  )
+
+  if (notEmpty(lineIds)) deleteLines(workbenchIdx, sketchIdx, lineIds)
+  if (notEmpty(arcIds)) deleteArcs(workbenchIdx, sketchIdx, arcIds)
+  if (notEmpty(circleIds)) deleteCircles(workbenchIdx, sketchIdx, circleIds)
+
+  // only refresh the workbench once, after all deletions are done
+  workbenchIsStale.set(true)
+}
 
-  // TODO: Handle compounds as well
-  for (const entity of selection) {
-    cad.sketchDeletePrimitive(workbenchIdx, sketchIdx, parseInt(entity.id))
+function deleteLines(workbenchIdx: number, sketchIdx: string, lineIds: number[]) {
+  const message: Message = {
+    DeleteLines: {
+      workbench_id: workbenchIdx,
+      sketch_id: sketchIdx,
+      line_ids: lineIds,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+}
+
+function deleteArcs(workbenchIdx: number, sketchIdx: string, arcIds: number[]) {
+  const message: Message = {
+    DeleteArcs: {
+      workbench_id: workbenchIdx,
+      sketch_id: sketchIdx,
+      arc_ids: arcIds,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+}
+
+function deleteCircles(workbenchIdx: number, sketchIdx: string, circleIds: number[]) {
+  const message: Message = {
+    DeleteCircles: {
+      workbench_id: workbenchIdx,
+      sketch_id: sketchIdx,
+      circle_ids: circleIds,
+    },
   }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
 }
 
-export function addRectangleBetweenPoints(sketchIdx: string, point1: string, point2: string) {
-  return cad.sketchAddRectangle(get(workbenchIndex).toString(), sketchIdx, point1, point2)
+export function addRectangleBetweenPoints(sketchIdx: string, point1: number, point2: number) {
+  log("[addRectangleBetweenPoints] sketchIdx, point1, point2", sketchIdx, point1, point2)
+  const message: Message = {
+    NewRectangleBetweenPoints: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchIdx,
+      start_id: point1,
+      end_id: point2,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
 export function addCircleBetweenPoints(sketchIdx: string, point1: string, point2: string) {
-  return cad.sketchAddCircle(get(workbenchIndex).toString(), sketchIdx, point1, point2)
+  log("[addCircleBetweenPoints]", "sketchIdx:", sketchIdx, "point1:", point1, "point2", point2)
+
+  const p1Valid = isStringInt(point1, id => console.error("[projectUtils.ts] [addCircleBetweenPoints]", "id is not an int:", id))
+  const p2Valid = isStringInt(point2, id => console.error("[projectUtils.ts] [addCircleBetweenPoints]", "id is not an int:", id))
+
+  if (!p1Valid || !p2Valid) return
+
+  const message: Message = {
+    NewCircleBetweenPoints: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchIdx,
+      center_id: parseInt(point1, 10),
+      edge_id: parseInt(point2, 10),
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
-export function addLineToSketch(sketchIdx: string, point1: string, point2: string) {
-  return cad.sketchAddLine(get(workbenchIndex).toString(), sketchIdx, point1, point2)
+export function addLineToSketch(sketchIdx: string, point1: number, point2: number) {
+  const message: Message = {
+    NewLineOnSketch: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchIdx,
+      start_point_id: point1,
+      end_point_id: point2,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
+  workbenchIsStale.set(true)
 }
 
-export function addPointToSketch(sketchIdx: string, point: Vector2Like, hidden: boolean): StepHash {
-  return cad.sketchAddPoint(get(workbenchIndex).toString(), sketchIdx, point.x, point.y).data
+export function addPointToSketch(sketchIdx: string, point: Vector2Like, hidden: boolean) {
+  log("[addPointToSketch] sketchIdx, point, hidden", sketchIdx, point, hidden)
+  const message: Message = {
+    NewPointOnSketch2: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchIdx,
+      x: point.x,
+      y: point.y,
+      hidden: hidden,
+    },
+  }
+  checkWasmMessage(message)
+  const reply = sendWasmMessage(message)
+  // log("[addPointToSketch sendWasmMessage]", "message:", message, "reply:", reply)
+
+  if (!reply.success) console.error("ERROR [projectUtils.ts addPointToSketch sendWasmMessage]", "message:", message, "reply:", reply)
+
+  workbenchIsStale.set(true)
+  return JSON.parse(reply.success).id
 }
 
-export function renameStep(stepIdx: string, newName: string): void {
-  cad.stepRename(get(workbenchIndex).toString(), stepIdx, newName)
+export function renameStep(stepIdx: number, newName: string): void {
+  log("[renameStep] stepIdx, newName", stepIdx, newName)
+  const message: Message = {
+    RenameStep: {
+      workbench_id: get(workbenchIndex),
+      step_id: stepIdx,
+      new_name: newName,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
 }
 
 export function renameWorkbench(newName: string): void {
-  cad.workbenchRename(get(workbenchIndex).toString(), newName)
+  log("[renameWorkbench] newName", newName)
+  const message: Message = {
+    RenameWorkbench: {
+      workbench_id: get(workbenchIndex),
+      new_name: newName,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
 }
 
 export function renameProject(newName: string): void {
-  cad.projectRename(newName)
+  log("[renameProject] newName", newName)
+  const message: Message = {
+    RenameProject: {
+      new_name: newName,
+    },
+  }
+  checkWasmMessage(message)
+  sendWasmMessage(message)
 }
 
 // If the project ever becomes stale, refresh it. This should be pretty rare.
@@ -200,16 +370,37 @@ workbenchIsStale.subscribe(value => {
     const workbenchIdx = get(workbenchIndex)
     const wasmProj = get(wasmProject)
     const workbenchJson = wasmProj.get_workbench(workbenchIdx)
-    workbench.set(workbenchJson)
+    // TODO: reach inside of project and set its representation
+    // of the workbench to the new one that we just got
+    workbench.set(JSON.parse(workbenchJson))
     workbenchIsStale.set(false)
-    workbenchSolids.set(getWorkbenchSolids())
+    // log("Workbench:", get(workbench))
+    realizationIsStale.set(true)
+  }
+})
+
+// If the realization ever becomes stale, refresh it. This should be very common.
+// Every time you edit any part of the feature history, for example
+realizationIsStale.subscribe(value => {
+  if (value) {
+    // log("[realizationIsStale] Refreshing realization")
+
+    const wasmProj = get(wasmProject)
+    const workbenchIdx = get(workbenchIndex)
+    const wasmReal: WasmRealization = wasmProj.get_realization(workbenchIdx, get(featureIndex) + 1)
+    wasmRealization.set(wasmReal)
+    realization.set(JSON.parse(wasmReal.to_json()))
+    // log("[realizationIsStale] New realization:", get(realization))
+    // log("[wasmProj]", wasmProj)
+
+    realizationIsStale.set(false)
   }
 })
 
 export function getObjectString(solidId: string): string {
-  const solids = get(workbenchSolids)
-  // TODO: Does this work?
-  const objString = solids[solidId].solid_to_obj(solidId, 0.1)
+  // log("[getObjectString] solidId:", solidId)
+  const wasmReal = get(wasmRealization)
+  const objString = wasmReal.solid_to_obj(solidId, 0.1)
   return objString
 }
 
@@ -239,7 +430,7 @@ export function arcToPoints(center: Vector2, start: Vector2, end: Vector2, clock
 
   const startAngle = Math.atan2(start.y - center.y, start.x - center.x)
 
-  const lineVertices: Vector2[] = []
+  const lineVertices = []
   lineVertices.push(start.clone())
   for (let i = 1; i <= Math.abs(n); i++) {
     const theta = ((2 * Math.PI) / n) * i + startAngle
@@ -268,7 +459,7 @@ export function circleToPoints(centerPoint: Vector2Like, radius: number): Vector
   // faster to calculate, at most only overestimates by 1:
   const n = Math.ceil(Math.PI / Math.sqrt(2 * k))
 
-  const lineVertices: Vector2[] = []
+  const lineVertices = []
   for (let i = 0; i <= n; i++) {
     const theta = ((2 * Math.PI) / n) * i
     const xComponent = radius * Math.cos(theta)
@@ -280,7 +471,7 @@ export function circleToPoints(centerPoint: Vector2Like, radius: number): Vector
 }
 
 export function promoteTo3(points: Vector2[]): Vector3[] {
-  const points3: Vector3[] = []
+  const points3 = []
   for (const point of points) {
     points3.push(new Vector3(point.x, point.y, 0))
   }
@@ -288,7 +479,7 @@ export function promoteTo3(points: Vector2[]): Vector3[] {
 }
 
 export function flatten(points: Vector3[]): number[] {
-  const pointsFlat: number[] = []
+  const pointsFlat = []
   for (const point of points) {
     pointsFlat.push(point.x, point.y, point.z)
   }
@@ -313,7 +504,7 @@ function notEmpty(array: unknown[]): boolean {
   return array && Array.isArray(array) && array.length > 0
 }
 
-export function checkWasmMessage(message: Message, abort = true, logError = true): boolean {
+function checkWasmMessage(message: Message, abort = true, logError = true): boolean {
   const key = Object.keys(message)[0]
   const command = message[key as keyof Message]
   if (!command) {
@@ -322,16 +513,114 @@ export function checkWasmMessage(message: Message, abort = true, logError = true
   }
   log("[checkWasmMessage]", "checking...", key, message)
 
+  switch (key) {
+    case "UpdateExtrusion":
+      if (!isUpdateExtrusion(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "SetSketchPlane":
+      if (!isSetSketchPlane(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewSketchOnPlane":
+      if (!isNewSketchOnPlane(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewExtrusion":
+      if (!isNewExtrusion(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "DeleteLines":
+      if (!isDeleteLines(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "DeleteArcs":
+      if (!isDeleteArcs(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "DeleteCircles":
+      if (!isDeleteCircles(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewRectangleBetweenPoints":
+      if (!isNewRectangleBetweenPoints(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewCircleBetweenPoints":
+      if (!isNewCircleBetweenPoints(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewLineOnSketch":
+      if (!isNewLineOnSketch(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "NewPointOnSketch2":
+      if (!isNewPointOnSketch2(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "RenameStep":
+      if (!isRenameStep(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "RenameWorkbench":
+      if (!isRenameWorkbench(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    case "RenameProject":
+      if (!isRenameProject(command)) {
+        logOrAbort()
+        return false
+      }
+      return true
+
+    default:
+      console.error("[projectUtils.ts] [checkWasmMessage]", "messageType typeGuard not implemented:", key)
+      return false
+  }
+
   function logOrAbort() {
     const error = `[${key}] message failed typecheck:`
     if (logError) console.error("[projectUtils.ts]", error, message)
     // if (abort && isDevelopment()) throw new Error(`"[projectUtils.ts]" ${error}`)
     return false
   }
-
-  if (!isMessage(command)) {
-    logOrAbort()
-    return false
-  }
-  return true
 }
diff --git a/packages/shared/stepTypeGuards.ts b/packages/shared/stepTypeGuards.ts
deleted file mode 100644
index 76ea8fce..00000000
--- a/packages/shared/stepTypeGuards.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { Arc2, Circle2, Line2, Point2, Solid, Step, SketchActionResult } from "cadmium"
-import { FeatureExtrusionAdd, SketchAddArc, SketchAddCircle, SketchAddLine, SketchAddPoint, WorkbenchPlaneAdd, WorkbenchPointAdd, WorkbenchSketchAdd } from "./cadmium-api"
-
-// --- Workbench operations ---
-export type PointStep = Step & {result: { type: "Point" }, data: {type: "WorkbenchPointAdd"} & WorkbenchPointAdd}
-export function isPointStep(step: Step): step is PointStep {
-  return step.data.type === "WorkbenchPointAdd" && step.result.type === "Point"
-}
-
-export type PlaneStep = Step & {result: { type: "Plane" }, data: {type: "WorkbenchPlaneAdd"} & WorkbenchPlaneAdd }
-export function isPlaneStep(step: Step): step is PlaneStep {
-  return step.data.type === "WorkbenchPlaneAdd" && step.result.type === "Plane"
-}
-
-export type SketchStep = Step & {result: { type: "Sketch" }, data: {type: "WorkbenchSketchAdd"} & WorkbenchSketchAdd }
-export function isSketchStep(step: Step): step is SketchStep {
-  return step.data.type === "WorkbenchSketchAdd" && step.result.type === "Sketch"
-}
-
-// --- Sketch primitive operations ---
-// Any primitive operation
-export type SketchActionStep = Step & {result: { type: "SketchAction", action: SketchActionResult & {type: string}, faces: Face[]}}
-export function isSketchActionStep(step: Step): step is SketchActionStep {
-  return step.result.type === "SketchAction"
-}
-
-export type SketchPointStep = SketchActionStep & {result: {action: {type: "Point2"} & Point2}, data: {type: "SketchAddPoint"} & SketchAddPoint}
-export function isSketchPointStep(step: Step): step is SketchPointStep {
-  return isSketchActionStep(step) && step.result.action.type === "Point2" && step.data.type === "SketchAddPoint"
-}
-
-export type SketchLineStep = SketchActionStep & {result: {action: {type: "Line2"} & Line2}, data: {type: "SketchAddLine"} & SketchAddLine}
-export function isSketchLineStep(step: Step): step is SketchLineStep {
-  return isSketchActionStep(step) && step.result.action.type === "Line2" && step.data.type === "SketchAddLine"
-}
-
-export type SketchCircleStep = SketchActionStep & {result: {action: {type: "Circle2"} & Circle2}, data: {type: "SketchAddCircle"} & SketchAddCircle}
-export function isSketchCircleStep(step: Step): step is SketchCircleStep {
-  return isSketchActionStep(step) && step.result.action.type === "Circle2" && step.data.type === "SketchAddCircle"
-}
-
-export type SketchArcStep = SketchActionStep & {result: {action: {type: "Arc2"} & Arc2}, data: {type: "SketchAddArc"} & SketchAddArc}
-export function isSketchArcStep(step: Step): step is SketchArcStep {
-  return isSketchActionStep(step) && step.result.action.type === "Arc2" && step.data.type === "SketchAddArc"
-}
-
-// TODO: export rectangle
-// export type SketchRectangleStep = SketchCompoundStep & {result: Rectangle, data: SketchAddRectangle}
-// export function isSketchRectangleStep(step: Step): step is SketchRectangleStep {
-//   return isSketchCompoundStep(step) && "SketchAddRectangle" in step.data && "Rectangle" in step.result.Compound
-// }
-
-// --- Solid operations ---
-// Any step that produces solids is a solid step
-export type SolidStep = Step & {result: {type: "Solid", solids: Solid[]}}
-export function isSolidStep(step: Step): step is SolidStep {
-  return step.result.type === "Solid"
-}
-
-export type ExtrusionStep = SolidStep & {data: {type: "FeatureExtrusionAdd"} & FeatureExtrusionAdd}
-export function isExtrusionStep(step: Step): step is ExtrusionStep {
-  return isSolidStep(step) && step.data.type === "FeatureExtrusionAdd"
-}
diff --git a/packages/shared/stores.ts b/packages/shared/stores.ts
index ab78da6e..086cfa0c 100644
--- a/packages/shared/stores.ts
+++ b/packages/shared/stores.ts
@@ -1,25 +1,29 @@
-import {Solid, StepHash, Project as WasmProject, Workbench} from "cadmium"
+import {Project as WasmProject, Realization as WasmRealization} from "cadmium"
 import {writable} from "svelte/store"
-import type {MessageHistory, Project, Entity, EntityType, SnapEntity, PointLikeById, PreviewGeometry, Point2WithID} from "./types"
+import type {WorkBench, MessageHistory, Project, Realization, Entity, EntityType, SnapEntity, PointLikeById, PreviewGeometry} from "./types"
 import {isArcEntity, isCircleEntity, isEntity, isFaceEntity, isLineEntity, isMeshFaceEntity, isPlaneEntity, isPoint3DEntity, isPointEntity} from "./typeGuards"
+// import { isDevelopment } from "../+layout"
 
 // prettier-ignore
 const log = (function () { const context = "[stores.ts]"; const color = "hotpink"; return Function.prototype.bind.call(console.log, console, `%c${context}`, `font-weight:bold;color:${color};`) })()
 
-export const wasmProject = writable<WasmProject>({} as WasmProject)
+// @ts-ignore
+export const wasmProject = writable<WasmProject>({})
 export const project = writable<Project>(emptyProject())
 export const projectIsStale = writable(false)
 
 export const workbenchIndex = writable(0)
-export const workbench = writable<Workbench>(emptyWorkBench())
-export const workbenchSolids = writable<Solid[]>([])
+export const workbench = writable<WorkBench>(emptyWorkBench())
 export const workbenchIsStale = writable(false)
 
 export const featureIndex = writable<number>(1000)
 export const extrusionFeatures = writable<Entity[]>([])
+export const wasmRealization = writable<WasmRealization>()
+export const realization = writable<Realization>(emptyRealization())
+export const realizationIsStale = writable(false)
 
-export const hiddenSketches = writable<StepHash[]>([])
-export const sketchBeingEdited = writable<StepHash | null>(null)
+export const hiddenSketches = writable<string[]>([])
+export const sketchBeingEdited = writable("")
 export const sketchTool = writable("")
 
 // could be looking for 'face' or 'plane' or other things
@@ -29,17 +33,20 @@ export const selectionMin = writable(0)
 
 export const currentlyMousedOver = writable<SnapEntity[]>([])
 export const currentlySelected = writable<Entity[]>([])
-export const snapPoints = writable<Point2WithID[]>([])
+export const snapPoints = writable<PointLikeById[]>([])
 export const previewGeometry = writable<PreviewGeometry[]>([])
 
 export const messageHistory = writable<MessageHistory[]>([])
 
+// if (isDevelopment()) {
 project.subscribe(store => log("[project]", store))
 workbenchIndex.subscribe(store => log("[workbenchIndex]", store))
 workbench.subscribe(store => log("[workbench]", store))
 workbenchIsStale.subscribe(store => log("[workbenchIsStale]", store))
 featureIndex.subscribe(store => log("[featureIndex]", store))
 extrusionFeatures.subscribe(store => log("[extrusionFeatures]", store))
+realization.subscribe(store => log("[realization]", store))
+realizationIsStale.subscribe(store => log("[realizationIsStale]", store))
 sketchBeingEdited.subscribe(store => log("[sketchBeingEdited]", store))
 messageHistory.subscribe(store => log("[messageHistory]", store))
 
@@ -58,6 +65,7 @@ currentlySelected.subscribe(store => {
     if (isType) log(`[currentlySelected] entity is ${type === "arc" ? "an" : "a"} ${type}:`, entity)
   })
 })
+// }
 
 function latestIsEntity(store: Entity[], type: EntityType) {
   if (store.length === 0) return [false, null]
@@ -86,18 +94,16 @@ function latestIsEntity(store: Entity[], type: EntityType) {
   return [false, null]
 }
 
-function emptyWorkBench(): Workbench {
+function emptyWorkBench(): WorkBench {
   return {
     name: "",
     history: [],
-    points: [],
-    points_next_id: 0,
-    sketches: [],
-    sketches_next_id: 0,
-    planes: [],
-    planes_next_id: 0,
-    features: [],
-    features_next_id: 0,
+    step_counters: {
+      Extrusion: 0,
+      Plane: 0,
+      Point: 0,
+      Sketch: 0,
+    },
   }
 }
 function emptyProject(): Project {
@@ -107,3 +113,11 @@ function emptyProject(): Project {
     workbenches: [],
   }
 }
+function emptyRealization(): Realization {
+  return {
+    planes: {},
+    points: {},
+    sketches: {},
+    solids: {},
+  }
+}
diff --git a/packages/shared/typeGuards.ts b/packages/shared/typeGuards.ts
index 19d02d31..4dbba072 100644
--- a/packages/shared/typeGuards.ts
+++ b/packages/shared/typeGuards.ts
@@ -1,4 +1,3 @@
-import { IDType, PlaneDescription } from "cadmium"
 import type {
   IDictionary,
   WithTarget,
@@ -1067,13 +1066,3 @@ export function isMessageHistory(obj: unknown): obj is MessageHistory {
   const typedObj = obj as MessageHistory
   return ((typedObj !== null && typeof typedObj === "object") || typeof typedObj === "function") && (isMessage(typedObj["message"]) as boolean)
 }
-
-export type PlaneDescriptionPlane = PlaneDescription & {PlaneId: IDType}
-export function isPlaneDescriptionPlane(plane_desc: PlaneDescription): plane_desc is PlaneDescriptionPlane {
-  return "PlaneId" in plane_desc
-}
-
-export type PlaneDescriptionSolid = PlaneDescription & {solid_id: IDType}
-export function isPlaneDescriptionSolid(plane_desc: PlaneDescription): plane_desc is PlaneDescriptionSolid {
-  return "SolidFace" in plane_desc
-}
diff --git a/packages/shared/types.d.ts b/packages/shared/types.d.ts
index fba0a9c0..15e5fdc2 100644
--- a/packages/shared/types.d.ts
+++ b/packages/shared/types.d.ts
@@ -1,16 +1,10 @@
-import { MessageResult, Point2, StepHash, Workbench } from "cadmium"
-import { Message } from "./cadmium-api"
+import { Message, MessageResult } from "cadmium"
 import type { Vector2, Vector3, Vector2Like, Vector3Like } from "three"
 
-export interface IDictionary<TValue> {
+interface IDictionary<TValue> {
   [id: string]: TValue
 }
 
-export type Point2WithID = Point2 & { id?: StepHash }
-
-// TODO: Somehow export the Face struct
-export type Face = any
-
 type WithTarget<Event, Target> = Event & { currentTarget: Target }
 
 type SetCameraFocus = (goTo: Vector3Like, lookAt: Vector3Like, up: Vector3Like) => void
@@ -66,7 +60,16 @@ type MeshFaceEntity = {
 interface Project {
   name: string
   assemblies: []
-  workbenches: Workbench[]
+  workbenches: WorkBench[]
+}
+
+interface WorkBench {
+  name: string
+  history: HistoryStep[]
+  renaming: boolean
+  step_counters: {
+    Extrusion: number, Plane: number, Point: number, Sketch: number
+  }
 }
 
 interface Realization {
@@ -135,6 +138,19 @@ interface SketchData {
   }
 }
 
+export interface Sketch_GeneratedFromRust {
+  points: Record<number, Point2>;
+  highest_point_id: number;
+  line_segments: Record<number, Line2>;
+  highest_line_segment_id: number;
+  circles: Record<number, Circle2>;
+  highest_circle_id: number;
+  arcs: Record<number, Arc2>;
+  highest_arc_id: number;
+  constraints: Record<number, Constraint>;
+  highest_constraint_id: number;
+}
+
 interface ExtrusionData {
   data: {
     type: HistoryStepType = "Extrusion"
@@ -340,9 +356,9 @@ interface ExtrusionSketchData {
 
 interface PreviewGeometry {
   type: EntityType
-  start?: Point2
-  end?: Point2
-  center?: Point2
+  start?: PointLikeById
+  end?: PointLikeById
+  center?: PointLikeById
   radius?: number
   x?: number
   y?: number
@@ -369,7 +385,7 @@ interface PointLikeById {
   [x: string]: any // hack todo fix
   twoD?: Vector2Like | Vector2 | Point2D
   threeD?: Vector3Like | Vector3 | Point3D
-  id?: StepHash | null
+  id?: string | null
 }
 
 type PointsById = IDictionary<PointById>
diff --git a/turbo.json b/turbo.json
index a0e6a643..df25e689 100644
--- a/turbo.json
+++ b/turbo.json
@@ -8,8 +8,6 @@
     "test": {
       "dependsOn": ["^build"]
     },
-    "test:unit": {},
-    "test:e2e": {},
     "lint": {},
     "format": {
       "cache": false,