diff --git a/.gitignore b/.gitignore
index 11cfb31c..ef7344d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 /dist
 /target
 /packages/cadmium/target
+/packages/cadmium/bench-*-report
 **/.svelte-kit
 /package
 *.env*
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 173c5e2a..e633e907 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -13,7 +13,6 @@
 				"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 d6c6b6fe..0c05d521 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,5 +3,13 @@
 	"vite.autoStart": false,
 	"vite.buildCommand": "pnpm run build",
 	"vite.devCommand": "pnpm run dev",
-	"vite.showTerminal": true
+	"vite.showTerminal": true,
+	"cSpell.words": [
+		"bindgen",
+		"isketch",
+		"Threlte",
+		"tsify",
+		"wireframe"
+	],
+	"editor.formatOnSave": true
 }
diff --git a/Cargo.lock b/Cargo.lock
index 6726e901..80558add 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,7 +45,22 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
- "memchr 2.7.2",
+ "memchr 2.7.4",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
 ]
 
 [[package]]
@@ -102,6 +117,29 @@ version = "2.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "220a2c618ab466efe41d0eace94dfeff1c35e3aa47891bdb95e1c0fefffd3c99"
 
+[[package]]
+name = "atk"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4"
+dependencies = [
+ "atk-sys",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.3.0"
@@ -110,9 +148,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.72"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -131,9 +169,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.22.1"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
@@ -255,11 +293,14 @@ 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",
  "serde",
  "serde_json",
@@ -273,8 +314,11 @@ dependencies = [
  "truck-shapeops",
  "truck-stepio",
  "truck-topology",
+ "tsify",
  "tsify-next",
  "wasm-bindgen",
+ "wasm-logger",
+ "xxhash-rust",
 ]
 
 [[package]]
@@ -287,11 +331,115 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "cadmium-native"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+]
+
+[[package]]
+name = "cairo-rs"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
+dependencies = [
+ "bitflags 2.5.0",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+ "once_cell",
+ "thiserror",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "camino"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "cargo_toml"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
+dependencies = [
+ "serde",
+ "toml 0.8.2",
+]
+
 [[package]]
 name = "cc"
-version = "1.0.98"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfb"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
+dependencies = [
+ "byteorder",
+ "fnv",
+ "uuid",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
 
 [[package]]
 name = "cfg-if"
@@ -328,7 +476,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -368,7 +516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
- "memchr 2.7.2",
+ "memchr 2.7.4",
 ]
 
 [[package]]
@@ -396,12 +544,55 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.4.2"
@@ -411,6 +602,15 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.5"
@@ -436,6 +636,53 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa 0.4.8",
+ "matches",
+ "phf 0.8.0",
+ "proc-macro2",
+ "quote",
+ "smallvec",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "ctor"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
+dependencies = [
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.9"
@@ -563,6 +810,17 @@ 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"
@@ -612,9 +870,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
 dependencies = [
  "dtoa",
 ]
@@ -654,7 +912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d"
 dependencies = [
  "cc",
- "memchr 2.7.2",
+ "memchr 2.7.4",
  "rustc_version",
  "toml 0.8.2",
  "vswhom",
@@ -826,7 +1084,7 @@ dependencies = [
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr 2.7.2",
+ "memchr 2.7.4",
  "pin-project-lite",
  "pin-utils",
  "slab",
@@ -1081,7 +1339,7 @@ dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "memchr 2.7.2",
+ "memchr 2.7.4",
  "once_cell",
  "smallvec",
  "thiserror",
@@ -1143,6 +1401,69 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "gobject-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c"
+dependencies = [
+ "atk",
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk",
+ "gdk-pixbuf",
+ "gio",
+ "glib",
+ "gtk-sys",
+ "gtk3-macros",
+ "libc",
+ "pango",
+ "pkg-config",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722"
+dependencies = [
+ "atk-sys",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk3-macros"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "hash32"
 version = "0.3.1"
@@ -1180,9 +1501,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "heck"
@@ -1224,7 +1545,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.9",
+ "itoa 1.0.11",
 ]
 
 [[package]]
@@ -1239,12 +1560,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
- "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "pin-project-lite",
@@ -1252,9 +1573,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
 
 [[package]]
 name = "hyper"
@@ -1268,7 +1589,7 @@ dependencies = [
  "http",
  "http-body",
  "httparse",
- "itoa 1.0.9",
+ "itoa 1.0.11",
  "pin-project-lite",
  "smallvec",
  "tokio",
@@ -1306,7 +1627,7 @@ dependencies = [
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows-core 0.51.1",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -1329,19 +1650,139 @@ dependencies = [
 ]
 
 [[package]]
-name = "ident_case"
+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"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
@@ -1366,10 +1807,34 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "infer"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb33622da908807a06f9513c19b3c1ad50fab3e4137d82a78107d502075aa199"
+dependencies = [
+ "cfb",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipnet"
+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#b060531aa3841103011168885c4fea47cc0dc490"
+source = "git+https://github.com/CADmium-Co/ISOtope.git#f2f4590e552e3407ae19d811e56cd4c1c83039db"
 dependencies = [
  "geo",
  "nalgebra",
@@ -1415,6 +1880,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -1599,6 +2070,12 @@ 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"
@@ -1615,6 +2092,21 @@ version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
+[[package]]
+name = "loom"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5"
+dependencies = [
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "lz4_flex"
 version = "0.7.5"
@@ -1708,9 +2200,18 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "mime"
@@ -1734,11 +2235,41 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "muda"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145"
+dependencies = [
+ "cocoa",
+ "crossbeam-channel",
+ "dpi",
+ "gtk",
+ "keyboard-types",
+ "objc",
+ "once_cell",
+ "png",
+ "serde",
+ "thiserror",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "nalgebra"
-version = "0.32.5"
+version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
+checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
 dependencies = [
  "approx 0.5.1",
  "matrixmultiply",
@@ -1762,6 +2293,47 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ndk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+dependencies = [
+ "bitflags 1.3.2",
+ "jni-sys",
+ "ndk-sys",
+ "num_enum",
+ "raw-window-handle 0.5.2",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
+[[package]]
+name = "ndk-sys"
+version = "0.4.1+23.1.7779620"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+dependencies = [
+ "jni-sys",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[package]]
+name = "nodrop"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+
 [[package]]
 name = "nom"
 version = "3.2.1"
@@ -1777,7 +2349,7 @@ version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
- "memchr 2.7.2",
+ "memchr 2.7.4",
  "minimal-lexical",
 ]
 
@@ -1958,6 +2530,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
  "bitflags 2.5.0",
  "block2",
+ "dispatch",
  "libc",
  "objc2",
 ]
@@ -2007,11 +2580,11 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.35.0"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
- "memchr 2.7.2",
+ "memchr 2.7.4",
 ]
 
 [[package]]
@@ -2077,7 +2650,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -2087,160 +2660,332 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
-name = "pkg-config"
-version = "0.3.30"
+name = "percent-encoding"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
-name = "plist"
-version = "1.6.1"
+name = "phf"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
- "base64 0.21.5",
- "indexmap 2.1.0",
- "line-wrap",
- "quick-xml 0.31.0",
- "serde",
- "time",
+ "phf_macros 0.8.0",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
 ]
 
 [[package]]
-name = "png"
-version = "0.17.13"
+name = "phf"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide",
+ "phf_shared 0.10.0",
 ]
 
 [[package]]
-name = "powerfmt"
-version = "0.2.0"
+name = "phf"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros 0.11.2",
+ "phf_shared 0.11.2",
+]
 
 [[package]]
-name = "ppv-lite86"
-version = "0.2.17"
+name = "phf_codegen"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+]
 
 [[package]]
-name = "precomputed-hash"
-version = "0.1.1"
+name = "phf_codegen"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd"
+dependencies = [
+ "phf_generator 0.10.0",
+ "phf_shared 0.10.0",
+]
 
 [[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
+name = "phf_generator"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
+ "phf_shared 0.8.0",
+ "rand 0.7.3",
 ]
 
 [[package]]
-name = "proc-macro-crate"
-version = "2.0.2"
+name = "phf_generator"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
 dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
+ "phf_shared 0.10.0",
+ "rand 0.8.5",
 ]
 
 [[package]]
-name = "proc-macro-error"
-version = "1.0.4"
+name = "phf_generator"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "proc-macro-error-attr",
+ "phf_shared 0.11.2",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c"
+dependencies = [
+ "phf_generator 0.8.0",
+ "phf_shared 0.8.0",
+ "proc-macro-hack",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "version_check",
 ]
 
 [[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
+name = "phf_macros"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "version_check",
+ "syn 2.0.66",
 ]
 
 [[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
+name = "phf_shared"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+dependencies = [
+ "siphasher",
+]
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.85"
+name = "phf_shared"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
- "unicode-ident",
+ "siphasher",
 ]
 
 [[package]]
-name = "quick-xml"
-version = "0.22.0"
+name = "phf_shared"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
- "memchr 2.7.2",
- "serde",
+ "siphasher",
 ]
 
 [[package]]
-name = "quick-xml"
-version = "0.31.0"
+name = "pin-project"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
- "memchr 2.7.2",
+ "pin-project-internal",
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.36"
+name = "pin-project-internal"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
+ "quote",
+ "syn 2.0.66",
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.3"
+name = "pin-project-lite"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
-name = "rand"
-version = "0.8.5"
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "plist"
+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",
+ "line-wrap",
+ "quick-xml 0.31.0",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "png"
+version = "0.17.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+dependencies = [
+ "toml_datetime",
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.85"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b"
+dependencies = [
+ "memchr 2.7.4",
+ "serde",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr 2.7.4",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+ "rand_pcg",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
@@ -2287,6 +3032,36 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "raw-window-handle"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"
+
+[[package]]
+name = "raw-window-handle"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -2324,9 +3099,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
  "bitflags 2.5.0",
 ]
@@ -2344,32 +3119,47 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
- "memchr 2.7.2",
- "regex-automata",
- "regex-syntax",
+ "memchr 2.7.4",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
- "memchr 2.7.2",
- "regex-syntax",
+ "memchr 2.7.4",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
@@ -2526,7 +3316,7 @@ checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
  "proc-macro2",
  "quote",
- "serde_derive_internals",
+ "serde_derive_internals 0.29.1",
  "syn 2.0.66",
 ]
 
@@ -2567,6 +3357,9 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "serde"
@@ -2577,6 +3370,17 @@ 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"
@@ -2616,7 +3420,7 @@ version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
- "itoa 1.0.9",
+ "itoa 1.0.11",
  "ryu",
  "serde",
 ]
@@ -2648,7 +3452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.9",
+ "itoa 1.0.11",
  "ryu",
  "serde",
 ]
@@ -2684,69 +3488,202 @@ dependencies = [
 ]
 
 [[package]]
-name = "simba"
-version = "0.8.1"
+name = "serialize-to-javascript"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
+checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
 dependencies = [
- "approx 0.5.1",
- "num-complex",
- "num-traits",
- "paste",
- "wide",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript-impl",
 ]
 
 [[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "spade"
-version = "2.8.0"
+name = "serialize-to-javascript-impl"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b20a809169ae442497e41a997fc5f14e2eea04e6ac590816a910d5d8068c8c0"
+checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
 dependencies = [
- "hashbrown 0.14.5",
- "num-traits",
- "robust",
- "smallvec",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
 ]
 
 [[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
+name = "servo_arc"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432"
+dependencies = [
+ "nodrop",
+ "stable_deref_trait",
+]
 
 [[package]]
-name = "state"
-version = "0.6.0"
+name = "sha2"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "loom",
+ "cfg-if",
+ "cpufeatures",
+ "digest",
 ]
 
 [[package]]
-name = "string_cache"
-version = "0.8.7"
+name = "sharded-slab"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
- "new_debug_unreachable",
- "once_cell",
- "parking_lot",
- "phf_shared 0.10.0",
- "precomputed-hash",
- "serde",
+ "lazy_static",
 ]
 
 [[package]]
-name = "string_cache_codegen"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "softbuffer"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ae0d2e93c874cca74fe830bccbd1132299318932d273d2a3c77ad77476a3d7e"
+dependencies = [
+ "bytemuck",
+ "cfg_aliases",
+ "core-graphics",
+ "foreign-types",
+ "js-sys",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "raw-window-handle 0.6.2",
+ "redox_syscall",
+ "wasm-bindgen",
+ "wayland-sys",
+ "web-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "soup3"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+dependencies = [
+ "futures-channel",
+ "gio",
+ "glib",
+ "libc",
+ "soup3-sys",
+]
+
+[[package]]
+name = "soup3-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "spade"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f4ec45f91925e2c9ab3b6a857ee9ed36916990df76a1c475d783a328e247cc8"
+dependencies = [
+ "hashbrown 0.14.5",
+ "num-traits",
+ "robust",
+ "smallvec",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "state"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
+dependencies = [
+ "loom",
+]
+
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+ "serde",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
 dependencies = [
  "phf_generator 0.10.0",
@@ -2772,11 +3709,11 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.26.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -2795,7 +3732,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204"
 dependencies = [
- "base64 0.21.5",
+ "base64 0.21.7",
  "serde",
  "serde_json",
 ]
@@ -2828,6 +3765,17 @@ 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"
@@ -2843,9 +3791,9 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a8121bd5721ebbbe0889f8286d5824673beeb04071519b68916fbed04f3093"
+checksum = "ea538df05fbc2dcbbd740ba0cfe8607688535f4798d213cbbfa13ce494f3451f"
 dependencies = [
  "bitflags 2.5.0",
  "cocoa",
@@ -2874,8 +3822,8 @@ dependencies = [
  "tao-macros",
  "unicode-segmentation",
  "url",
- "windows 0.56.0",
- "windows-core 0.56.0",
+ "windows 0.57.0",
+ "windows-core 0.57.0",
  "windows-version",
  "x11-dl",
 ]
@@ -3068,7 +4016,7 @@ dependencies = [
  "json-patch",
  "kuchikiki",
  "log",
- "memchr 2.7.2",
+ "memchr 2.7.4",
  "phf 0.11.2",
  "proc-macro2",
  "quote",
@@ -3150,7 +4098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
- "itoa",
+ "itoa 1.0.11",
  "num-conv",
  "powerfmt",
  "serde",
@@ -3174,11 +4122,77 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.20.2",
+]
+
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -3187,6 +4201,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
  "indexmap 2.2.6",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
@@ -3197,7 +4213,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -3294,9 +4310,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b27516dfcfa22a9faaf192283a122bfbede38c1e59ef194e3c4db6549b419c0"
+checksum = "3ad8319cca93189ea9ab1b290de0595960529750b6b8b501a399ed1ec3775d60"
 dependencies = [
  "cocoa",
  "core-graphics",
@@ -3468,6 +4484,7 @@ checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0"
 dependencies = [
  "gloo-utils 0.1.7",
  "serde",
+ "serde-wasm-bindgen",
  "serde_json",
  "tsify-macros",
  "wasm-bindgen",
@@ -3517,26 +4534,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.12"
+name = "unic-char-property"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
 
 [[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
+name = "unic-char-range"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
 
 [[package]]
-name = "unicode-normalization"
-version = "0.1.23"
+name = "unic-ucd-version"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
 dependencies = [
- "tinyvec",
+ "unic-common",
 ]
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.11.0"
@@ -3545,9 +4588,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -3574,6 +4617,18 @@ 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"
@@ -3698,9 +4753,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3737,6 +4792,17 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
+[[package]]
+name = "wasm-logger"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "074649a66bb306c8f2068c9016395fa65d8e08d2affcbf95acf3c24c3ab19718"
+dependencies = [
+ "log",
+ "wasm-bindgen",
+ "web-sys",
+]
+
 [[package]]
 name = "wasm-streams"
 version = "0.4.0"
@@ -3772,38 +4838,325 @@ dependencies = [
 ]
 
 [[package]]
-name = "wide"
-version = "0.7.22"
+name = "webkit2gtk"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c5cb32c74fe55350a3272ba792f050613e692253ae0d89ad5d83eb0dcea15e1"
+checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
 dependencies = [
- "bytemuck",
- "safe_arch",
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "gdk",
+ "gdk-sys",
+ "gio",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "gtk",
+ "gtk-sys",
+ "javascriptcore-rs",
+ "libc",
+ "once_cell",
+ "soup3",
+ "webkit2gtk-sys",
 ]
 
 [[package]]
-name = "windows-core"
-version = "0.52.0"
+name = "webkit2gtk-sys"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
 dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
+ "bitflags 1.3.2",
+ "cairo-sys-rs",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "javascriptcore-rs-sys",
+ "libc",
+ "pkg-config",
+ "soup3-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "webview2-com"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c914dd492a52f0377bef56fd1b6e74a79090f9ee631d625d5b505a00e4538b6"
+dependencies = [
+ "webview2-com-macros",
+ "webview2-com-sys",
+ "windows 0.56.0",
+ "windows-core 0.56.0",
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+]
+
+[[package]]
+name = "webview2-com-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "webview2-com-sys"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a46bcf03482ec28eeb764ca788f67998cde4213adfbbfa90462622058530f5e"
+dependencies = [
+ "thiserror",
+ "windows 0.56.0",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "window-vibrancy"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33082acd404763b315866e14a0d5193f3422c81086657583937a750cdd3ec340"
+dependencies = [
+ "cocoa",
+ "objc",
+ "raw-window-handle 0.6.2",
+ "windows-sys 0.52.0",
+ "windows-version",
+]
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
+dependencies = [
+ "windows-core 0.56.0",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+dependencies = [
+ "windows-core 0.57.0",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
+dependencies = [
+ "windows-implement 0.56.0",
+ "windows-interface 0.56.0",
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement 0.57.0",
+ "windows-interface 0.57.0",
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.56.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
  "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -3821,18 +5174,48 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.5"
@@ -3845,24 +5228,72 @@ version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.5"
@@ -3875,9 +5306,100 @@ version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
- "memchr 2.7.2",
+ "memchr 2.7.4",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa597526af53f310a8e6218630c5024fdde8271f229e70d7d2fc70b52b8fb1e"
+dependencies = [
+ "base64 0.22.1",
+ "block",
+ "cocoa",
+ "core-graphics",
+ "crossbeam-channel",
+ "dpi",
+ "dunce",
+ "gdkx11",
+ "gtk",
+ "html5ever",
+ "http",
+ "javascriptcore-rs",
+ "jni",
+ "kuchikiki",
+ "libc",
+ "ndk",
+ "ndk-context",
+ "ndk-sys",
+ "objc",
+ "objc_id",
+ "once_cell",
+ "percent-encoding",
+ "raw-window-handle 0.6.2",
+ "sha2",
+ "soup3",
+ "tao-macros",
+ "thiserror",
+ "webkit2gtk",
+ "webkit2gtk-sys",
+ "webview2-com",
+ "windows 0.56.0",
+ "windows-core 0.56.0",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "x11"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "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"
@@ -3887,6 +5409,30 @@ 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"
@@ -3906,3 +5452,46 @@ 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/README.md b/README.md
index a9685f80..0e27cdad 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,8 @@ 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/src/App.svelte b/applications/web/src/App.svelte
index 2f01772c..aa95dfb0 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(val => $wasmProject["get_workbench"] && workbenchIsStale.set(true))
+  featureIndex.subscribe(_ => $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 c04fd408..62231b41 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 9f63c020..92caafbd 100644
--- a/applications/web/src/components/Arc.svelte
+++ b/applications/web/src/components/Arc.svelte
@@ -5,14 +5,16 @@
   import {T} from "@threlte/core"
   import {flatten, arcToPoints, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {EntityType, SketchPoint} from "shared/types"
+  import type {EntityType} 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: SketchPoint, start: SketchPoint, end: SketchPoint
+  export let id: string, center: Point2, start: Point2, end: Point2
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -25,9 +27,9 @@
 
   $: selected = $currentlySelected.some(e => isEntity(e) && e.id === id && e.type === type) ? true : false
 
-  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 center2 = new Vector2(center.x, center.y)
+  const start2 = new Vector2(start.x, start.y)
+  const end2 = new Vector2(end.x, end.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 57413622..00cfcdde 100644
--- a/applications/web/src/components/Circle.svelte
+++ b/applications/web/src/components/Circle.svelte
@@ -4,13 +4,15 @@
   import {T} from "@threlte/core"
   import {flatten, circleToPoints, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {CircleTuple, EntityType} from "shared/types"
+  import type {EntityType} from "shared/types"
+  import type { Point2 } from "cadmium"
 
+  // @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: CircleTuple["center"], radius: number
+  export let id: string, center: Point2, radius: number
 
   // log("[props]", "id:", id, "center:", center, "radius:", radius)
 
@@ -25,7 +27,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.twoD, radius)))
+  const points = flatten(promoteTo3(circleToPoints(center, 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 b23c5368..0d165f30 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, SketchPoint} from "shared/types"
-  // import Sketch from './Sketch.svelte'
+  import type {EntityType, IDictionary, Point2WithID} from "shared/types"
 
+  // @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,8 +13,7 @@
   // 	 exterior: wire
   //   holes: wires[]
   // }
-  export let face: any, id: string, pointsById: IDictionary<SketchPoint>
-  // log("[props]", "face:", face, "id:", id, "pointsById:", pointsById)
+  export let face: any, id: string, pointsById: IDictionary<Point2WithID>
 
   const type: EntityType = "face"
 
@@ -36,31 +35,33 @@
   function writeWireToShape(wire: {Circle: any; Segments: any}, shape: Path) {
     if (wire.Circle) {
       let circle = wire.Circle
-      let center = pointsById[circle.center]
-      let radius = circle.radius
-      let points = circleToPoints(new Vector2(center.twoD.x, center.twoD.y), radius)
+      let center = circle.center.data
+      let radius = circle.data
+      let points = circleToPoints(new Vector2(center[0], center[1]), radius)
       shape.setFromPoints(points)
     } else if (wire.Segments) {
       let points = []
       for (let segment of wire.Segments) {
-        if (segment.type === "Line") {
-          let start = pointsById[segment.start]
-          let end = pointsById[segment.end]
+        console.log("segment", segment)
+        if ("Line" in segment) {
+          let start = segment.Line.start
+          let end = segment.Line.end
 
           if (points.length === 0) {
-            points.push(new Vector2(start.twoD.x, start.twoD.y))
+            points.push(new Vector2(start.data[0], start.data[1]))
           }
-          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]
+          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]
 
           let arcPoints = arcToPoints(
-            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,
+            new Vector2(center.x, center.y),
+            new Vector2(start.x, start.y),
+            new Vector2(end.x, end.y),
+            segment.Arc.clockwise,
           )
 
           if (points.length !== 0) {
diff --git a/applications/web/src/components/FeatureHistory.svelte b/applications/web/src/components/FeatureHistory.svelte
index bf608cf1..7ab57b8c 100644
--- a/applications/web/src/components/FeatureHistory.svelte
+++ b/applications/web/src/components/FeatureHistory.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
-  import {workbench, realization} from "shared/stores"
+  import {workbench} 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 {isPoint, isPlane, isExtrusion, isSketch} from "shared/projectUtils"
+  import {isPointStep, isPlaneStep, isSolidStep, isSketchStep, isExtrusionStep} from "shared/stepTypeGuards"
   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
@@ -22,11 +23,10 @@
   $: partsHeight = overallHeight - height - 12
 
   $: history = $workbench.history ?? []
-  $: solids = $realization.solids ?? {}
+  $: 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 feature, featureIdx (feature.data.type + ":" + feature.unique_id)}
+    {#each history as step, featureIndex}
       <div>
-        {#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} />
+        {#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} />
         {:else}
-          TODO: {feature.name} {feature.data.type}
+          <!-- TODO: {step.name} {step.result} -->
         {/if}
       </div>
     {/each}
@@ -78,8 +78,10 @@
     <div class="font-bold text-sm px-2 py-2">
       Solids ({solids ? Object.keys(solids).length : 0})
     </div>
-    {#each Object.keys(solids) as name (name)}
-      <SolidItem {name} />
+    {#each history as step}
+      {#if isSolidStep(step)}
+        <SolidItem name={step.name} />
+      {/if}
     {/each}
   </div>
 </div>
diff --git a/applications/web/src/components/Line.svelte b/applications/web/src/components/Line.svelte
index 152e67fc..8edd368d 100644
--- a/applications/web/src/components/Line.svelte
+++ b/applications/web/src/components/Line.svelte
@@ -5,13 +5,14 @@
   import {T} from "@threlte/core"
   import {flatten, promoteTo3} from "shared/projectUtils"
   import {currentlySelected, currentlyMousedOver, sketchTool} from "shared/stores"
-  import type {EntityType, PointById} from "shared/types"
+  import type {EntityType} 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: PointById, end: PointById
-  // log("[props]", "id:", id, "start:", start, "end:", end)
+  export let id: string, start: Point2, end: Point2
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -23,19 +24,10 @@
   const type: EntityType = "line"
 
   let hovered = 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)}
+  $: selected = $currentlySelected.some(e => isEntity(e) && e.id === id && e.type === type) ? true : false
 
   const points = flatten(
-		promoteTo3([new Vector2(start.twoD.x, start.twoD.y), new Vector2(end.twoD.x, end.twoD.y)])
+		promoteTo3([new Vector2(start.x, start.y), new Vector2(end.x, end.y)])
 	)
 
   const lineGeometry = new LineGeometry()
diff --git a/applications/web/src/components/PassiveSketch.svelte b/applications/web/src/components/PassiveSketch.svelte
index 1780eb7b..ef4ea44a 100644
--- a/applications/web/src/components/PassiveSketch.svelte
+++ b/applications/web/src/components/PassiveSketch.svelte
@@ -1,34 +1,40 @@
 <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 type {ArcTuple, CircleTuple, FaceTuple, IDictionary, LineTuple, PlaneData, PreviewGeometry, SketchPoint, PointById, SketchRealized} from "shared/types"
+
+  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 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,
-    sketch: SketchRealized,
-    plane: PlaneData["data"]["plane"],
-    uniqueId: string,
-    editing = false
-
-  // log("[props]", "name:", name, "sketch:", sketch, "plane:", plane, "uniqueId:", uniqueId, "editing:", editing )
+    plane: Plane,
+    hash: StepHash,
+    editing: boolean = false
 
   const {size, dpr} = useThrelte()
 
+  $: history = $workbench.history ?? []
+
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
     solidLineMaterial: LineMaterial,
@@ -38,63 +44,6 @@
 
   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)
@@ -138,8 +87,12 @@
   const lineGeometry = new LineGeometry()
   lineGeometry.setPositions(points)
 
-  $: hidden = $hiddenSketches.includes(uniqueId) && !editing
-  // $: $hiddenSketches, log("[$hiddenSketches]", $hiddenSketches)
+  $: 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>)
 
   $: if (editing) $sketchTool = "select"
 
@@ -150,7 +103,6 @@
   }
 
   function isGeomType(geom: PreviewGeometry, type: string) {
-    // log("[isGeomType]", type, geom)
     return geom.type === type
   }
 </script>
@@ -169,17 +121,17 @@
       on:click={e => {
         if (editing) {
           if ($sketchTool === "line") {
-            newLineTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
+            newLineTool.click(e, projectToPlane(e.point))
           } else if ($sketchTool === "circle") {
-            newCircleTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
+            newCircleTool.click(e, projectToPlane(e.point))
           } else if ($sketchTool === "rectangle") {
-            newRectangleTool.click(e, {twoD: projectToPlane(e.point), threeD: e.point})
+            newRectangleTool.click(e, projectToPlane(e.point))
           } else if ($sketchTool === "select") {
             selectTool.click(e, projectToPlane(e.point))
           }
         }
       }}
-      on:pointermove={debounce(e => {
+      on:pointermove={debounce((e: any) => {
         if (editing) {
           if ($sketchTool === "line") {
             newLineTool.mouseMove(e, projectToPlane(e.point))
@@ -194,10 +146,10 @@
       <T.PlaneGeometry args={[width * 100, height * 100]} />
     </T.Mesh>
 
-    <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} />
+    <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} />
 
     <T.Line2
       geometry={lineGeometry}
@@ -213,54 +165,61 @@
       </Suspense>
     </T.Group>
 
-    {#each circleTuples as circle (circle.id)}
-      <Circle
-        center={circle.center}
-        radius={circle.radius}
-        id={circle.id}
-        {solidLineMaterial}
-        {solidHoveredMaterial}
-        {solidSelectedMaterial}
-        {dashedHoveredMaterial}
-        {dashedLineMaterial}
-        {collisionLineMaterial}
-      />
-    {/each}
-
-    {#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 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 lineTuples as line (line.id)}
-      <Line
-        start={line.start}
-        end={line.end}
-        id={line.id}
-        {solidLineMaterial}
-        {solidHoveredMaterial}
-        {solidSelectedMaterial}
-        {dashedHoveredMaterial}
-        {dashedLineMaterial}
-        {collisionLineMaterial}
-      />
+      {#if isSketchActionStep(step)}
+        {#each step.result.faces as face, faceId}
+          <Face face={face} id={`${hash}-${faceId}`} {pointsById} />
+        {/each}
+      {/if}
     {/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}
@@ -271,8 +230,8 @@
         />
       {:else if isGeomType(geom, "circle")}
         <Circle
-          center={geom.center}
-          radius={geom.radius}
+          center={geom.center!}
+          radius={geom.radius!}
           id={geom.uuid}
           {solidLineMaterial}
           {solidHoveredMaterial}
@@ -282,16 +241,8 @@
           {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 c31f8ad5..bcc1ee92 100644
--- a/applications/web/src/components/Plane.svelte
+++ b/applications/web/src/components/Plane.svelte
@@ -10,12 +10,11 @@
   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()
@@ -140,9 +139,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 d2b43da5..9542d470 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, y, hidden: boolean, id: string
+  export let x: number, y: number, 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 81552a5f..15560e1b 100644
--- a/applications/web/src/components/Point3D.svelte
+++ b/applications/web/src/components/Point3D.svelte
@@ -11,6 +11,7 @@
 
   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 a713ebbc..f6df0db9 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 {realization, workbench, sketchBeingEdited} from "shared/stores"
+  import {workbench, sketchBeingEdited} from "shared/stores"
   import Point3D from "./Point3D.svelte"
   import Plane from "./Plane.svelte"
   import Solid from "./Solid.svelte"
@@ -12,29 +12,16 @@
   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()
 
-  $: 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]))()
+  $: history = $workbench.history ?? []
 
   export function setCameraFocus(goTo: Vector3Like, lookAt: Vector3Like, up: Vector3Like): void {
     // TODO: make this tween nicely
@@ -122,7 +109,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} on:create={({ref}) => {}} mouseButtons={{LEFT: 2, MIDDLE: 50, RIGHT: 1}} />
+  <CadControls rotateSpeed={1.8} panSpeed={0.5} mouseButtons={{LEFT: 2, MIDDLE: 50, RIGHT: 1}} />
 </T.OrthographicCamera>
 
 <!-- <T.DirectionalLight args={['#ff8888', 50.0]} position.x={-10} position.y={0} position.z={0} />
@@ -138,54 +125,57 @@
 <!-- <T.AmbientLight intensity={0.6} /> -->
 
 <Environment path="{base}/envmap/hdr/" files="kloofendal_28d_misty_puresky_1k.hdr" isBackground={false} format="hdr" />
-
-{#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 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}
 
 <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 dddca715..bf5c50d6 100644
--- a/applications/web/src/components/SelectableSurface.svelte
+++ b/applications/web/src/components/SelectableSurface.svelte
@@ -8,6 +8,7 @@
   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 3ddc86f0..54027f5f 100644
--- a/applications/web/src/components/Sketch.svelte
+++ b/applications/web/src/components/Sketch.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
-  import type {LineMaterial} from "three/examples/jsm/lines/LineMaterial.js"
   import PassiveSketch from "./PassiveSketch.svelte"
+
+  import type {LineMaterial} from "three/examples/jsm/lines/LineMaterial.js"
+
   import {currentlySelected, previewGeometry, sketchTool} from "shared/stores"
-  import type {PlaneRealized, SketchTuple} from "shared/types"
+  import type {ISketch} from "cadmium"
 
+  // @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 uniqueId: string, name: string, sketchTuple: SketchTuple, editing: boolean, plane: PlaneRealized
-
-  // log("[props]", "uniqueId:", uniqueId, "name:", name, "sketchTuple", sketchTuple, "editing", editing, "plane", plane)
+  export let hash: string, name: string, sketch: ISketch, editing: boolean = false
 
   export let dashedLineMaterial: LineMaterial,
     dashedHoveredMaterial: LineMaterial,
@@ -44,33 +45,17 @@
   }
 </script>
 
-{#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}
+<PassiveSketch
+  {name}
+  {hash}
+  plane={sketch.plane}
+  editing
+  {solidLineMaterial}
+  {solidHoveredMaterial}
+  {solidSelectedMaterial}
+  {dashedHoveredMaterial}
+  {dashedLineMaterial}
+  {collisionLineMaterial}
+/>
 
 <svelte:window on:keydown={onKeyDown} />
diff --git a/applications/web/src/components/Solid.svelte b/applications/web/src/components/Solid.svelte
index f68c7c03..0b5904c5 100644
--- a/applications/web/src/components/Solid.svelte
+++ b/applications/web/src/components/Solid.svelte
@@ -6,6 +6,7 @@
   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 0d195ff3..993a8213 100644
--- a/applications/web/src/components/ToolBar.svelte
+++ b/applications/web/src/components/ToolBar.svelte
@@ -7,7 +7,6 @@
 
   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
@@ -18,7 +17,6 @@
     newSketchOnPlane()
     $featureIndex = $workbench.history.length - 1
   }
-  const stepSketch = () => {}
   const debugging = false
 
   const actions = [
@@ -33,8 +31,6 @@
   ]
 
   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")},
@@ -42,7 +38,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 !== ""}
+  {#if $sketchBeingEdited !== null}
     {#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 ee0c40dc..ac7c646b 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 {forwardEventHandlers, T, useTask, useParent, useThrelte} from "@threlte/core"
+  import {T, useTask, useParent, useThrelte} from "@threlte/core"
 
   import type {Camera} from "three"
   import {TrackballControls as ThreeTrackballControls} from "./CadControls.js"
@@ -31,13 +31,14 @@
     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} bind:this={$component} on:change={invalidate}> -->
+<T is={ref} let:ref {...$$restProps} 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 59036d75..90c308d0 100644
--- a/applications/web/src/components/features/Extrusion.svelte
+++ b/applications/web/src/components/features/Extrusion.svelte
@@ -4,22 +4,24 @@
   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, id: string, data: ExtrusionData["data"]["extrusion"]
+  export let name: string, index: number, hash: StepHash, data: FeatureExtrusionAdd
 
   // $: 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.face_ids.sort().map(e => e + "")
+  let faceIdsFromInputs = data.faces.sort().map(e => e + "")
 
   // reactive update of selected faces
-  $: if (data && data.face_ids) faceIdsFromInputs = data.face_ids.map(e => e + "").sort()
+  $: if (data && data.faces) faceIdsFromInputs = data.faces.map(e => e + "").sort()
 
   let length = data.length
 
@@ -39,13 +41,13 @@
 
   function sendUpdate(specificFaceIds?: string[]) {
     if (specificFaceIds) {
-      updateExtrusion(id, data.sketch_id, length, specificFaceIds)
+      updateExtrusion(hash, data.sketch_id, length, specificFaceIds)
     } else {
       const faceIdsFromSelection = $currentlySelected
         .filter(e => e.type === "face")
         .map(e => e.id)
         .sort()
-      updateExtrusion(id, data.sketch_id, length, faceIdsFromSelection)
+      updateExtrusion(hash, data.sketch_id, length, faceIdsFromSelection)
     }
   }
 
@@ -151,7 +153,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(index, name)
+            renameStep(hash, name)
           }}>Done</button
         >
 
diff --git a/applications/web/src/components/features/Sketch.svelte b/applications/web/src/components/features/Sketch.svelte
index c4ec9132..0f62ad83 100644
--- a/applications/web/src/components/features/Sketch.svelte
+++ b/applications/web/src/components/features/Sketch.svelte
@@ -18,12 +18,14 @@
   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, id: string, plane_id: string
-
-  // $: name, log("[props] name:", name, "index:", index, "id:", id, "plane_id:", plane_id)
+  export let name: string, index: number, hash: StepHash, plane_desc: PlaneDescription | undefined
+  log("[props]", "name:", name, "index:", index, "hash:", hash, "plane_desc:", plane_desc)
 
   const source = `${base}/actions/sketch_min.svg`
 
@@ -31,10 +33,18 @@
   let selectingForSketchPlane = false
 
   $: {
-    if (plane_id !== "") {
-      surface = {type: "plane", id: plane_id}
+    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)
     } else {
       surface = null
+    }
+
+    if (surface === null) {
       engageSearchForPlane()
     }
   }
@@ -44,7 +54,7 @@
   const closeAndRefresh = () => {
     log("closing, refreshing")
     $featureIndex = 1000
-    $sketchBeingEdited = ""
+    $sketchBeingEdited = null
     $sketchTool = ""
     $selectingFor = []
     $selectionMax = 1000
@@ -52,10 +62,7 @@
     $currentlySelected = []
   }
 
-  $: if ($featureIndex === index) $sketchBeingEdited = id
-
-  // $: $sketchBeingEdited,
-  // 	log("[$sketchBeingEdited]", `${$sketchBeingEdited === "" ? "empty" : ""}`, $sketchBeingEdited)
+  $: if ($featureIndex === index) $sketchBeingEdited = hash
 
   const engageSearchForPlane = () => {
     // log("engage search!")
@@ -85,13 +92,13 @@
 
   currentlySelected.subscribe(() => {
     if (!selectingForSketchPlane) return
-    if (!id) return
+    if (!hash) return
     if (!$currentlySelected.length) return
     // log("CS changed when selecting for Sketch Plane:", $currentlySelected)
 
     let thingSelected = $currentlySelected[0]
     if (thingSelected.type === "plane") {
-      setSketchPlane(id, thingSelected.id)
+      setSketchPlane(hash, parseInt(thingSelected.id))
     } else if (thingSelected.type === "meshFace") {
       log("HOW DO I HANDLE THIS?")
       log(thingSelected)
@@ -128,20 +135,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(id)) {
+      if ($hiddenSketches.includes(hash)) {
         // cool, unhide
         hiddenSketches.update(sketches => {
-          return sketches.filter(sketch => sketch !== id)
+          return sketches.filter(sketch => sketch !== hash)
         })
       } else {
         // cool, hide
         hiddenSketches.update(sketches => {
-          return [...sketches, id]
+          return [...sketches, hash]
         })
       }
     }}
   >
-    {#if $hiddenSketches.includes(id)}
+    {#if $hiddenSketches.includes(hash)}
       <EyeSlash weight="light" size="18px" />
     {:else}
       <Eye weight="light" size="18px" />
@@ -177,7 +184,7 @@
         on:focusin={engageSearchForPlane}
         on:focusout={disengageSearchForPlane}
       >
-        <div class="h-8" />
+        <div class="h-8"></div>
         {#if surface !== null}
           <div class="bg-sky-200 pl-2 py-0.5 m-1 rounded text-sm">
             {surface.type}:{surface.id}<button
@@ -194,7 +201,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(index, name)
+            renameStep(hash, name)
           }}>Done</button
         >
 
diff --git a/applications/web/src/components/tools/NewCircle.svelte b/applications/web/src/components/tools/NewCircle.svelte
index b372a755..3643c812 100644
--- a/applications/web/src/components/tools/NewCircle.svelte
+++ b/applications/web/src/components/tools/NewCircle.svelte
@@ -1,50 +1,45 @@
 <script lang="ts">
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
-  import {addCircleBetweenPoints, addPointToSketch} from "shared/projectUtils"
-  import {Vector3, type Vector2Like, type Vector3Like} from "three"
-  import type {PointLikeById, Point2D, PointsLikeById, ProjectToPlane} from "shared/types"
+  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"
 
+  // @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: PointsLikeById
-  export let sketchIndex: string
+  export let pointsById: IDictionary<Point2>
+  export let sketchId: string
   export let active: boolean
   export let projectToPlane: ProjectToPlane
 
-  let centerPoint: PointLikeById | null = null
-  let stack: PointLikeById[] = []
+  let centerPoint: Point2WithID | undefined = undefined
+  let stack: Point2WithID[] = []
 
   $: if ($sketchTool !== "circle") clearStack()
 
-  function pushToStack(point: PointLikeById) {
+  function pushToStack(point: Point2WithID) {
     if (!point) return
-    point.id = point.id ?? addPointToSketch(sketchIndex, point.twoD, false)
+    point.id = point.id ?? bench.sketchAddPoint(sketchId, point.x, point.y).data
     stack.push(point)
   }
 
-  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
+  function processPoint(point: Point2WithID) {
+    if (stack.length === 0) {
+      centerPoint = point
+      pushToStack(point)
+      return
     }
+
+    const radius = calcDeltas(centerPoint!, point)
+    bench.sketchAddCircle(sketchId, centerPoint!.id!, radius)
+    clearStack()
   }
 
-  export function click(_event: Event, projected: {twoD: Vector2Like; threeD: Vector3Like}) {
+  export function click(_event: Event, projected: Vector2) {
     if ($snapPoints.length > 0) processPoint($snapPoints[0])
     else {
-      let pt: PointLikeById = {twoD: projected.twoD, threeD: projected.threeD, id: null}
-      processPoint(pt)
+      processPoint({x: projected.x, y: projected.y, hidden: false} as Point2WithID)
     }
   }
 
@@ -55,19 +50,15 @@
     // 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 = null
+    let snappedTo: Point2WithID | null = null
     for (const geom of $currentlyMousedOver) {
       if (geom.type === "point3D") {
-        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,
-        }
+        const point = projectToPlane(new Vector3(geom.x, geom.y, geom.z))
+        snappedTo = {x: point.x, y: point.y, hidden: false} as Point2WithID
       }
       if (geom.type === "point") {
         const point = pointsById[geom.id]
-        if (point.twoD && point.threeD && geom.id) snappedTo = {twoD: point.twoD, threeD: point.threeD, id: geom.id}
+        if (point && geom.id) snappedTo = {x: point.x, y: point.y, hidden: false, id: geom.id} as Point2WithID
         break // If there is a 2D point, prefer to use it rather than the 3D point
       }
     }
@@ -77,25 +68,20 @@
     else if ($snapPoints.length > 0) $snapPoints = []
 
     if (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)
+      const radius = snappedTo ? calcDeltas(snappedTo!, centerPoint) : calcDeltas(projected, centerPoint)
 
       previewGeometry.set([
         {
           type: "circle",
           center: centerPoint,
           radius,
-          uuid: `circle-${centerPoint.twoD?.x}-${centerPoint.twoD?.y}-${radius}`,
+          uuid: `circle-${centerPoint.x}-${centerPoint.y}-${radius}`,
         },
         {
           type: "point",
-          x: centerPoint.twoD?.x,
-          y: centerPoint.twoD?.y,
-          uuid: `point-${centerPoint.twoD?.x}-${centerPoint.twoD?.y}`,
+          x: centerPoint.x,
+          y: centerPoint.y,
+          uuid: `point-${centerPoint.x}-${centerPoint.y}`,
         },
       ])
     } else {
@@ -111,14 +97,20 @@
     }
   }
 
+  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 = null
+    centerPoint = undefined
     previewGeometry.set([])
     snapPoints.set([])
     stack = []
   }
 
-  function popFromStack(): PointLikeById | undefined {
+  function popFromStack(): Point2WithID | undefined {
     return stack.pop()
   }
 </script>
diff --git a/applications/web/src/components/tools/NewLine.svelte b/applications/web/src/components/tools/NewLine.svelte
index fd809ed2..a7cc0b6f 100644
--- a/applications/web/src/components/tools/NewLine.svelte
+++ b/applications/web/src/components/tools/NewLine.svelte
@@ -1,107 +1,93 @@
 <script lang="ts">
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
-  import {addLineToSketch, addPointToSketch} from "shared/projectUtils"
-  import {Vector3} from "three"
-  import type {IDictionary, Point, PointLikeById, PreviewGeometry, ProjectToPlane, SketchPoint} from "shared/types"
+  import {bench} from "shared/projectUtils"
+  import {Vector2, Vector3} from "three"
+  import type {IDictionary, Point2WithID, PreviewGeometry, ProjectToPlane} from "shared/types"
+  import type {Point2} from "cadmium"
 
+  // @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<SketchPoint>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
+  export let pointsById: IDictionary<Point2>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
 
-  let previousPoint: PointLikeById | null = null
+  let previousPoint: Point2WithID | null = null
 
-  let stack: PointLikeById[] = []
+  let stack: Point2WithID[] = []
 
   $: if ($sketchTool !== "line") clearStack()
 
-  function pushToStack(point: PointLikeById) {
+  function pushToStack(point: Point2WithID) {
     // 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 ?? addPointToSketch(sketchIndex, point.twoD, false)
+    point.id = point.id ?? bench.sketchAddPoint(sketchIndex, point.x, point.y).data
     stack.push(point)
   }
 
-  function processPoint(point: PointLikeById) {
+  function processPoint(point: Point2WithID) {
     pushToStack(point)
     previousPoint = point
 
-    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
+    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()
     }
   }
 
-  export function click(_event: Event, projected: Point) {
+  export function click(_event: Event, projected: Vector2) {
     if ($snapPoints.length > 0) processPoint($snapPoints[0])
-    else processPoint({twoD: projected.twoD, threeD: projected.threeD, id: null})
+    else processPoint({x: projected.x, y: projected.y, hidden: false} as Point2WithID)
   }
 
   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: PointLikeById | null = null
+    let snappedTo: Point2WithID | 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))
-          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
+          snappedTo = { x: twoD.x, y: twoD.y, hidden: false } as Point2WithID
         }
       }
       if (geom.type === "point") {
-        const point = pointsById[geom.id]
-        snappedTo = {
-          twoD: point.twoD,
-          threeD: point.threeD,
-          id: geom.id,
-        } satisfies PointLikeById
+        snappedTo = pointsById[geom.id]
         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 PointLikeById[]
+    if (snappedTo) $snapPoints = [snappedTo] satisfies Point2WithID[]
     else if ($snapPoints.length > 0) $snapPoints = []
 
     if (previousPoint) {
-      let end: PointLikeById = {twoD: {x: projected.x, y: projected.y}} satisfies PointLikeById
+      let end: Point2WithID = {x: projected.x, y: projected.y, hidden: false} as Point2WithID
 
       if (snappedTo) end = snappedTo
 
       const previewGeoms = [
-        {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}`},
+        {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}`},
       ] satisfies PreviewGeometry[]
 
       if (previousPoint.id === null) {
         const p = {
           type: "point",
-          x: previousPoint.twoD!.x,
-          y: previousPoint.twoD!.y,
-          uuid: `point-null-${previousPoint.twoD!.x}-${previousPoint.twoD!.y}`,
+          x: previousPoint.x,
+          y: previousPoint.y,
+          uuid: `point-null-${previousPoint.x}-${previousPoint.y}`,
         } satisfies PreviewGeometry
         previewGeoms.push(p)
       }
@@ -125,7 +111,7 @@
     stack = []
   }
 
-  function popFromStack(): PointLikeById | undefined {
+  function popFromStack(): Point2WithID | undefined {
     return stack.pop()
   }
 </script>
diff --git a/applications/web/src/components/tools/NewRectangle.svelte b/applications/web/src/components/tools/NewRectangle.svelte
index d51915dc..5e2db1fd 100644
--- a/applications/web/src/components/tools/NewRectangle.svelte
+++ b/applications/web/src/components/tools/NewRectangle.svelte
@@ -2,11 +2,13 @@
   import {snapPoints, sketchTool, previewGeometry, currentlyMousedOver} from "shared/stores"
   import {addRectangleBetweenPoints, addPointToSketch} from "shared/projectUtils"
   import {Vector3} from "three"
-  import type {IDictionary, PointLikeById, ProjectToPlane, SketchPoint} from "shared/types"
+  import type {IDictionary, PointLikeById, ProjectToPlane} from "shared/types"
+  import type { Point2 } from "cadmium"
 
+  // @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<SketchPoint>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
+  export let pointsById: IDictionary<Point2>, sketchIndex: string, active: boolean, projectToPlane: ProjectToPlane
 
   let anchorPoint: PointLikeById | null = null
 
@@ -32,7 +34,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 719dc3c9..e8ae9e63 100644
--- a/applications/web/src/components/tools/Select.svelte
+++ b/applications/web/src/components/tools/Select.svelte
@@ -2,6 +2,7 @@
   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/packages/cadmium-macros/src/lib.rs b/packages/cadmium-macros/src/lib.rs
index 355da664..aa314eb4 100644
--- a/packages/cadmium-macros/src/lib.rs
+++ b/packages/cadmium-macros/src/lib.rs
@@ -1,5 +1,6 @@
-use quote::quote;
-use syn::{parse_macro_input, DeriveInput};
+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 {
@@ -10,27 +11,81 @@ pub fn message_handler_derive(input: proc_macro::TokenStream) -> proc_macro::Tok
         _ => panic!("MessageEnum can only be derived for enums"),
     };
 
-    let variants = data.variants.iter().map(|variant| {
-        println!("Message Handler: {}", variant.ident);
-        let variant_name = &variant.ident;
+    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");
+            };
 
-        quote! {
-            #name::#variant_name(msg)
-        }
-    }).collect::<Vec<_>>();
+            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 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::IDType>> {
+            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 {
@@ -38,5 +93,155 @@ pub fn message_handler_derive(input: proc_macro::TokenStream) -> proc_macro::Tok
                 }
             }
         }
+
+        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
new file mode 100644
index 00000000..cb2f0347
--- /dev/null
+++ b/packages/cadmium/.cargo/cargo.toml
@@ -0,0 +1,3 @@
+[env]
+RUST_BACKTRACE = 1
+RUST_LIB_BACKTRACE = 0
diff --git a/packages/cadmium/Cargo.toml b/packages/cadmium/Cargo.toml
index 6f2092c7..0bce9ffa 100644
--- a/packages/cadmium/Cargo.toml
+++ b/packages/cadmium/Cargo.toml
@@ -5,6 +5,7 @@ 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
@@ -30,9 +31,31 @@ 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"] }
+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/benches/faceselector-report/draw.rs b/packages/cadmium/benches/faceselector-report/draw.rs
new file mode 100644
index 00000000..3edba3c7
--- /dev/null
+++ b/packages/cadmium/benches/faceselector-report/draw.rs
@@ -0,0 +1,66 @@
+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
new file mode 100644
index 00000000..8844c796
--- /dev/null
+++ b/packages/cadmium/benches/faceselector-report/main.rs
@@ -0,0 +1,130 @@
+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
new file mode 100644
index 00000000..ebce82c0
--- /dev/null
+++ b/packages/cadmium/benches/faceselector-report/report.rs
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 00000000..dec51692
--- /dev/null
+++ b/packages/cadmium/benches/faceselector-report/simple_circles.rs
@@ -0,0 +1,50 @@
+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 98a7425b..c3f70127 100644
--- a/packages/cadmium/examples/project_simple_extrusion.rs
+++ b/packages/cadmium/examples/project_simple_extrusion.rs
@@ -1,33 +1,83 @@
-use cadmium::workbench::AddSketch;
-use cadmium::solid::extrusion::{self, Direction, Mode};
-use cadmium::project::Project;
-use cadmium::message::MessageHandler as _;
-use cadmium::isketch::{AddLine, AddPoint};
 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;
 
 fn main() {
-    let p = Project::new("Test Project");
-    let wb_ref = p.workbenches.first().unwrap();
+    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 }.handle_message(wb_ref.clone()).unwrap().unwrap();
-    let sketch = wb_ref.borrow().get_sketch_by_id(sketch_id).unwrap();
+    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 = AddPoint { x: 0.0, y: 0.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-    let lr = AddPoint { x: 40.0, y: 0.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-    let ul = AddPoint { x: 0.0, y: 40.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-    let ur = AddPoint { x: 40.0, y: 40.0 }.handle_message(sketch.clone()).unwrap().unwrap();
+    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();
+    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();
 
-    let faces = sketch.borrow().sketch().borrow().get_faces();
-    extrusion::Add { sketch_id, faces, length: 25.0, offset: 0.0, direction: Direction::Normal, mode: Mode::New }.handle_message(wb_ref.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 solid_ref = wb.solids.first_key_value().unwrap().1;
-    let solid = solid_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();
 
     println!("{:?}", solid);
 
diff --git a/packages/cadmium/package.json b/packages/cadmium/package.json
index 28ab7e90..0d2dbf54 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 && set RUST_BACKTRACE=1 wasm-pack build --no-pack --target web --dev",
-    "build": "wasm-pack build --target web --no-pack",
+    "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",
     "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 3450df57..2103c073 100644
--- a/packages/cadmium/src/archetypes.rs
+++ b/packages/cadmium/src/archetypes.rs
@@ -1,10 +1,11 @@
 use isotope::primitives::point2::Point2 as ISOPoint2;
-use tsify_next::Tsify;
 use serde::{Deserialize, Serialize};
-use truck_modeling::Plane as TruckPlane;
 use truck_modeling::InnerSpace;
+use truck_modeling::Plane as TruckPlane;
+use tsify_next::Tsify;
 
-use crate::solid::point::Point3;
+use crate::feature::point::Point3;
+use crate::step::StepHash;
 use crate::IDType;
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
@@ -103,7 +104,6 @@ impl Plane {
     }
 }
 
-
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Vector2 {
@@ -155,6 +155,34 @@ 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 {
@@ -169,26 +197,114 @@ impl From<Point2> for ISOPoint2 {
     }
 }
 
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Line3 {
-    pub start: u64,
-    pub end: u64,
+impl FromSketchPrimitive<ISOPoint2> for Point2 {
+    fn from_sketch(_sketch: &isotope::sketch::Sketch, primitive: &ISOPoint2) -> Self {
+        Self {
+            x: primitive.x(),
+            y: primitive.y(),
+            hidden: false,
+        }
+    }
 }
 
 #[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 struct Arc2 {
+    pub center: StepHash,
+    pub radius: f64,
     pub clockwise: bool,
+    pub start_angle: f64,
+    pub end_angle: f64,
 }
 
+// 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(),
+//         }
+//     }
+// }
+
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Circle3 {
-    pub center: u64,
+pub struct Circle2 {
+    pub center: StepHash,
     pub radius: f64,
-    pub top: 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,
+}
+
+// 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),
+}
+
+// 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
new file mode 100644
index 00000000..47f991fc
--- /dev/null
+++ b/packages/cadmium/src/bin/gen-types.rs
@@ -0,0 +1,53 @@
+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 ddd064be..46340225 100644
--- a/packages/cadmium/src/error.rs
+++ b/packages/cadmium/src/error.rs
@@ -2,30 +2,30 @@ use thiserror::Error;
 
 #[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),
 
-	// 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,
+    // 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,
 
-	// StepData errors
-	#[error("The step {0} data type is not as expected")]
-	IncorrectStepDataType(String),
+    // 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/solid/extrusion.rs b/packages/cadmium/src/feature/extrusion.rs
similarity index 70%
rename from packages/cadmium/src/solid/extrusion.rs
rename to packages/cadmium/src/feature/extrusion.rs
index 2c3747f4..5b994b51 100644
--- a/packages/cadmium/src/solid/extrusion.rs
+++ b/packages/cadmium/src/feature/extrusion.rs
@@ -1,7 +1,6 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
-use isotope::decompose::face::Face;
 use serde::{Deserialize, Serialize};
 use truck_modeling::builder;
 use tsify_next::Tsify;
@@ -9,15 +8,15 @@ use tsify_next::Tsify;
 use super::prelude::*;
 
 use crate::archetypes::Vector3;
+use crate::isketch::face::{FaceSelector, Selector};
 use crate::isketch::ISketch;
-use crate::message::MessageHandler;
+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;
-use super::FeatureCell;
-use super::SolidLike;
+use super::{Feature, SolidLike};
 
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
@@ -38,7 +37,7 @@ pub enum Direction {
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Extrusion {
-    pub faces: Vec<Face>,
+    pub faces: Selector,
     pub sketch: Rc<RefCell<ISketch>>,
     pub length: f64,
     pub offset: f64,
@@ -48,7 +47,7 @@ pub struct Extrusion {
 
 impl Extrusion {
     pub fn new(
-        faces: Vec<Face>,
+        faces: Vec<IDType>,
         sketch: Rc<RefCell<ISketch>>,
         length: f64,
         offset: f64,
@@ -56,7 +55,7 @@ impl Extrusion {
         mode: Mode,
     ) -> Self {
         Extrusion {
-            faces,
+            faces: Selector::from_face_ids(&sketch.clone().borrow(), faces),
             sketch,
             length,
             offset,
@@ -67,7 +66,7 @@ impl Extrusion {
 }
 
 impl SolidLike for Extrusion {
-    fn references(&self) -> Vec<FeatureCell> {
+    fn references(&self) -> Vec<Rc<RefCell<Feature>>> {
         // self.faces.iter().map(|f| FeatureCell::Face(f.clone())).collect()
         todo!("Extrusion::references")
     }
@@ -77,7 +76,8 @@ impl SolidLike for Extrusion {
     }
 
     fn get_truck_solids(&self) -> anyhow::Result<Vec<TruckClosedSolid>> {
-        let plane = self.sketch.borrow().plane.borrow().clone();
+        let sketch = self.sketch.borrow();
+        let plane = sketch.plane.borrow().clone();
 
         let extrusion_direction = match &self.direction {
             Direction::Normal => plane.tertiary.clone(),
@@ -87,29 +87,46 @@ impl SolidLike for Extrusion {
 
         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 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
+        Ok(self
+            .faces
+            .get_selected_faces(&sketch)
             .iter()
             .map(|f| {
-                let wires = get_isoface_wires(self.sketch.clone(), f).unwrap();
+                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())
+            })
+            .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: IDType,
-    pub faces: Vec<Face>, // TODO: This should be a list of face IDs
+    pub sketch_id: StepHash,
+    pub faces: Vec<IDType>,
     pub length: f64,
     pub offset: f64,
     pub direction: Direction,
@@ -119,9 +136,12 @@ pub struct Add {
 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>> {
+    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 sketch = workbench.get_sketch_by_id(self.sketch_id)?;
 
         let extrusion = Extrusion::new(
             self.faces.clone(),
@@ -131,16 +151,19 @@ impl MessageHandler for Add {
             self.direction.clone(),
             self.mode.clone(),
         );
-
-        // TODO: This is incorrect. We should adding Features to the workbench, not solids
-        // Until then we can't update or remove as we don't know which solids are associated with this extrusion
-        extrusion.to_solids()?.iter().for_each(|solid| {
-            let id = workbench.solids_next_id;
-            workbench.solids.insert(id, Rc::new(RefCell::new(solid.clone())));
-            workbench.solids_next_id += 1;
-        });
-
-        Ok(None)
+        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()?,
+            },
+        )))
     }
 }
 
@@ -175,7 +198,7 @@ mod tests {
             // get a realization
             let workbench_ref = p.get_workbench_by_id(0).unwrap();
             let workbench = workbench_ref.borrow();
-            let solids = &workbench.solids;
+            let solids = &workbench.features;
             println!("[{}] solids: {:?}", file, solids.len());
 
             assert_eq!(solids.len(), *expected_solids); // doesn't work yet!
@@ -187,7 +210,8 @@ mod tests {
         let p = create_test_project();
         let workbench_ref = p.get_workbench_by_id(0).unwrap();
         let workbench = workbench_ref.borrow();
-        let solid = workbench.solids.get(&0).unwrap().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/solid/helpers.rs b/packages/cadmium/src/feature/helpers.rs
similarity index 92%
rename from packages/cadmium/src/solid/helpers.rs
rename to packages/cadmium/src/feature/helpers.rs
index ec1918eb..022548ac 100644
--- a/packages/cadmium/src/solid/helpers.rs
+++ b/packages/cadmium/src/feature/helpers.rs
@@ -4,6 +4,7 @@ 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;
@@ -11,17 +12,25 @@ use truck_polymesh::Tolerance;
 use truck_shapeops::{ShapeOpsCurve, ShapeOpsSurface};
 use truck_topology::Shell;
 
-use crate::isketch::ISketch;
 use super::prelude::*;
+use crate::isketch::ISketch;
 
-pub fn geopoint_to_truckpoint(point: geo::Point<f64>, sketch: Rc<RefCell<ISketch>>) -> Result<TruckPoint3, anyhow::Error> {
+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 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> {
+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())?);
@@ -103,8 +112,6 @@ pub fn fuse<C: ShapeOpsCurve<S> + std::fmt::Debug, S: ShapeOpsSurface + std::fmt
     solid0: &TruckTopoSolid<TruckPoint3, C, TruckSurface>,
     solid1: &TruckTopoSolid<TruckPoint3, C, TruckSurface>,
 ) -> Option<TruckTopoSolid<TruckPoint3, C, TruckSurface>> {
-    println!("Okay let's fuse!");
-
     let solid0_boundaries = solid0.boundaries();
     let solid1_boundaries = solid1.boundaries();
     assert!(solid0_boundaries.len() == 1);
@@ -116,10 +123,10 @@ pub fn fuse<C: ShapeOpsCurve<S> + std::fmt::Debug, S: ShapeOpsSurface + std::fmt
     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);
+    debug!("fusable_faces: {:?}", fusable_faces);
 
     let secondary_mergeable_faces = find_coplanar_face_pairs(boundary0, boundary1, false);
-    println!("secondary_mergeable_faces: {:?}", secondary_mergeable_faces);
+    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.
diff --git a/packages/cadmium/src/feature/mod.rs b/packages/cadmium/src/feature/mod.rs
new file mode 100644
index 00000000..d6cc3379
--- /dev/null
+++ b/packages/cadmium/src/feature/mod.rs
@@ -0,0 +1,45 @@
+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/solid/point.rs b/packages/cadmium/src/feature/point.rs
similarity index 58%
rename from packages/cadmium/src/solid/point.rs
rename to packages/cadmium/src/feature/point.rs
index 181d3896..d45a418f 100644
--- a/packages/cadmium/src/solid/point.rs
+++ b/packages/cadmium/src/feature/point.rs
@@ -2,9 +2,9 @@ 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 isotope::primitives::point2::Point2 as ISOPoint2;
 use tsify_next::Tsify;
 
 use crate::archetypes::{Plane, Vector3};
@@ -51,7 +51,7 @@ impl Point3 {
         (dx * dx + dy * dy + dz * dz).sqrt()
     }
 
-		pub fn from_plane_point(plane: &Plane, point: &ISOPoint2) -> Point3 {
+    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();
@@ -62,48 +62,49 @@ impl Point3 {
 }
 
 impl From<Point3> for PolyTruckPoint3 {
-		fn from(val: Point3) -> Self {
-				PolyTruckPoint3 {
-						x: val.x,
-						y: val.y,
-						z: val.z,
-				}
-		}
+    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,
-				}
-		}
+    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,
-				}
-		}
+    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
-		}
+    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;
 
@@ -111,8 +112,24 @@ 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, id: IDType) -> anyhow::Result<Self> {
-        Ok(parent.borrow().points.get(&id).ok_or(anyhow::anyhow!(""))?.clone())
+    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)
     }
 }
 
@@ -126,7 +143,10 @@ pub struct WorkbenchPointUpdate {
 
 impl MessageHandler for WorkbenchPointUpdate {
     type Parent = Rc<RefCell<Point3>>;
-    fn handle_message(&self, point_ref: Rc<RefCell<Point3>>) -> anyhow::Result<Option<IDType>> {
+    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;
diff --git a/packages/cadmium/src/solid/prelude.rs b/packages/cadmium/src/feature/prelude.rs
similarity index 78%
rename from packages/cadmium/src/solid/prelude.rs
rename to packages/cadmium/src/feature/prelude.rs
index e7e9c058..d0cd17ad 100644
--- a/packages/cadmium/src/solid/prelude.rs
+++ b/packages/cadmium/src/feature/prelude.rs
@@ -1,24 +1,24 @@
+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::Solid as TruckSolid;
-pub use truck_modeling::Vertex as TruckVertex;
+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::Plane as TruckPlane;
-pub use truck_modeling::Line as TruckLine;
-pub use truck_modeling::Surface as TruckSurface;
+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,
-        >;
-
-pub use super::helpers::*;
+pub type TruckClosedSolid =
+    TruckTopoSolid<truck_modeling::Point3, truck_modeling::Curve, truck_modeling::Surface>;
diff --git a/packages/cadmium/src/solid/mod.rs b/packages/cadmium/src/feature/solid.rs
similarity index 73%
rename from packages/cadmium/src/solid/mod.rs
rename to packages/cadmium/src/feature/solid.rs
index 6cd53025..cd13e51f 100644
--- a/packages/cadmium/src/solid/mod.rs
+++ b/packages/cadmium/src/feature/solid.rs
@@ -1,11 +1,8 @@
-use std::cell::Ref;
-use std::cell::RefCell;
-use std::cell::RefMut;
 use std::fmt::Debug;
-use std::rc::Rc;
 
 use serde::{Deserialize, Serialize};
 use tsify_next::Tsify;
+use wasm_bindgen::prelude::*;
 
 use truck_meshalgo::prelude::OptimizingFilter;
 use truck_meshalgo::tessellation::MeshableShape;
@@ -16,74 +13,12 @@ use truck_stepio::out;
 use crate::archetypes::Vector2;
 use crate::archetypes::Vector3;
 
-pub mod extrusion;
-pub mod helpers;
-pub mod point;
-pub mod prelude;
-
-use prelude::*;
-
-const MESH_TOLERANCE: f64 = 0.1;
-
-pub trait SolidLike: Debug {
-    fn references(&self) -> Vec<FeatureCell>;
-    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)]
-pub enum Feature {
-    Extrusion(extrusion::Extrusion),
-}
-
-impl Feature {
-    pub fn as_solid_like(&self) -> &dyn SolidLike {
-        match self {
-            Feature::Extrusion(extrusion) => extrusion,
-        }
-    }
-}
+use super::prelude::*;
 
 #[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
-pub enum FeatureCell {
-    Extrusion(Rc<RefCell<extrusion::Extrusion>>),
-}
-
-impl FeatureCell {
-    pub fn borrow(&self) -> Ref<dyn SolidLike> {
-        match self {
-            FeatureCell::Extrusion(e) => e.borrow(),
-        }
-    }
-
-    pub fn borrow_mut(&self) -> RefMut<dyn SolidLike > {
-        match self {
-            FeatureCell::Extrusion(e) => e.borrow_mut(),
-        }
-    }
-
-    pub fn as_ptr(&self) -> *const dyn SolidLike {
-        match self {
-            FeatureCell::Extrusion(e) => e.as_ptr(),
-        }
-    }
-}
-
-impl PartialEq for FeatureCell {
-    fn eq(&self, other: &Self) -> bool {
-        std::ptr::eq(self.as_ptr(), other.as_ptr())
-    }
-}
+#[repr(transparent)]
+pub struct SolidArray(pub Vec<Solid>);
 
 #[derive(Tsify, Debug, Serialize, Deserialize, Clone)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
@@ -99,10 +34,7 @@ pub struct Solid {
 }
 
 impl Solid {
-    pub fn from_truck_solid(
-        name: String,
-        truck_solid: TruckClosedSolid,
-    ) -> Self {
+    pub fn from_truck_solid(name: String, truck_solid: TruckClosedSolid) -> Self {
         let mut solid = Solid {
             name,
             crc32: "".to_owned(),
@@ -216,5 +148,4 @@ impl Solid {
         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.rs b/packages/cadmium/src/isketch.rs
deleted file mode 100644
index cfd0d979..00000000
--- a/packages/cadmium/src/isketch.rs
+++ /dev/null
@@ -1,248 +0,0 @@
-use std::cell::RefCell;
-use std::collections::BTreeMap;
-use std::rc::Rc;
-
-use isotope::decompose::face::Face;
-use isotope::primitives::line::Line;
-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::solid::point::Point3;
-use crate::IDType;
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct IPlane {
-    // TODO: Should hold its own ID
-    // pub id: String,
-    pub plane: Plane,
-    pub name: String,
-    pub width: f64,
-    pub height: f64,
-}
-
-#[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>>,
-    points_3d: BTreeMap<u64, Point3>,
-}
-
-impl ISketch {
-    // TODO: Maybe pass the plane as refcell?
-    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(),
-            // primitives: sketch.borrow().primitives().iter().map(|(id, prim)| (*id, prim.borrow().to_primitive())).collect(),
-            // constraints: sketch.borrow().constraints().iter().map(|c| c.borrow().get_type()).collect(),
-            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> {
-        // TODO: How do we keep track of faces vs IDs?
-        self.sketch.borrow().get_merged_faces()
-    }
-
-    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
-            }
-        })
-    }
-}
-
-use crate::message::{Identifiable, MessageHandler};
-use crate::workbench::Workbench;
-
-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, id: IDType) -> anyhow::Result<Self> {
-        Ok(parent.borrow().sketches.get(&id).ok_or(anyhow::anyhow!(""))?.clone())
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddPoint {
-    pub x: f64,
-    pub y: f64,
-}
-
-impl MessageHandler for AddPoint {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(&self, sketch_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
-        let iso_point = ISOPoint2::new(self.x, self.y);
-        let iso_point_cell = PrimitiveCell::Point2(Rc::new(RefCell::new(iso_point.clone())));
-
-        let mut sketch = sketch_ref.borrow_mut();
-        // TODO: On plane change the 3D points have to be recalculated
-        let plane = sketch.plane.borrow().clone();
-        let point_id = sketch.sketch().borrow_mut().add_primitive(iso_point_cell)?;
-        sketch.points_3d.insert(point_id, Point3::from_plane_point(&plane, &iso_point));
-        Ok(Some(point_id))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddArc {
-    pub center: IDType,
-    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>> {
-        let isketch = sketch_ref.borrow();
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let center_point = if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(self.center).unwrap() {
-            point
-        } else {
-            return Err(anyhow::anyhow!("Center point is not a point"));
-        };
-
-        let arc = 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 point_id = sketch.add_primitive(arc)?;
-        Ok(Some(point_id))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddCircle {
-    pub center: IDType,
-    pub radius: f64,
-}
-
-impl MessageHandler for AddCircle {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(&self, sketch_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
-        let isketch = sketch_ref.borrow();
-        let mut sketch = isketch.sketch.borrow_mut();
-
-        let center_point = if let PrimitiveCell::Point2(point) = sketch.get_primitive_by_id(self.center).unwrap() {
-            point
-        } else {
-            return Err(anyhow::anyhow!("Center point is not a point"));
-        };
-
-        let circle = PrimitiveCell::Circle(Rc::new(RefCell::new(isotope::primitives::circle::Circle::new(center_point.clone(), self.radius))));
-
-        let point_id = sketch.add_primitive(circle)?;
-        Ok(Some(point_id))
-    }
-}
-
-#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
-#[tsify(from_wasm_abi, into_wasm_abi)]
-pub struct AddLine {
-    pub start: IDType,
-    pub end: IDType,
-}
-
-impl MessageHandler for AddLine {
-    type Parent = Rc<RefCell<ISketch>>;
-    fn handle_message(&self, sketch_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
-        let isketch = sketch_ref.borrow();
-        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 line = PrimitiveCell::Line(Rc::new(RefCell::new(Line::new(start_point.clone(), end_point.clone()))));
-
-        let point_id = sketch.add_primitive(line)?;
-        Ok(Some(point_id))
-    }
-}
-
-#[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>> {
-        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/isketch/compound.rs b/packages/cadmium/src/isketch/compound.rs
new file mode 100644
index 00000000..dfe021a8
--- /dev/null
+++ b/packages/cadmium/src/isketch/compound.rs
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 00000000..39c2e7e1
--- /dev/null
+++ b/packages/cadmium/src/isketch/compound_rectangle.rs
@@ -0,0 +1,109 @@
+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
new file mode 100644
index 00000000..cbb393aa
--- /dev/null
+++ b/packages/cadmium/src/isketch/face.rs
@@ -0,0 +1,91 @@
+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
new file mode 100644
index 00000000..962af7f9
--- /dev/null
+++ b/packages/cadmium/src/isketch/mod.rs
@@ -0,0 +1,169 @@
+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
new file mode 100644
index 00000000..8ef4f2c5
--- /dev/null
+++ b/packages/cadmium/src/isketch/primitive.rs
@@ -0,0 +1,212 @@
+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 8e7517fd..f1c90213 100644
--- a/packages/cadmium/src/lib.rs
+++ b/packages/cadmium/src/lib.rs
@@ -1,25 +1,30 @@
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+
+use feature::solid::SolidArray;
 use message::{Message, MessageResult};
-// 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 message;
 pub mod project;
-pub mod solid;
-#[macro_use]
 pub mod step;
 pub mod workbench;
 
-// pub use isotope::primitives::ParametricCell;
-// pub use isotope::constraints::ConstraintCell;
-
 #[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,
@@ -30,6 +35,7 @@ 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,18 +76,28 @@ impl Project {
     #[wasm_bindgen]
     pub fn get_workbench(&self, workbench_index: u32) -> workbench::Workbench {
         // TODO: Use get() and return a Result
-        self.native.workbenches
+        self.native
+            .workbenches
             .get(workbench_index as usize)
             .unwrap()
             .borrow()
-            .clone() // This single call polutes Clone derives for all MessageHandlers
+            .clone() // This single call pollutes Clone derives for all MessageHandlers
     }
 
     #[wasm_bindgen]
     pub fn send_message(&mut self, message: &Message) -> MessageResult {
-        // TODO: Move this to a MessageHandler trait during first stage indirection
-        self.get_workbench(0).add_message_step(message);
-
         message.handle(&mut self.native).into()
     }
+
+    #[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(),
+        )
+    }
 }
diff --git a/packages/cadmium/src/main.rs b/packages/cadmium/src/main.rs
index 6eb890e2..15b4ab14 100644
--- a/packages/cadmium/src/main.rs
+++ b/packages/cadmium/src/main.rs
@@ -2,7 +2,7 @@
 
 use std::ops::{Sub, SubAssign};
 
-use cadmium::solid::helpers::fuse;
+use cadmium::feature::helpers::fuse;
 use truck_meshalgo::filters::OptimizingFilter;
 use truck_meshalgo::tessellation::{MeshableShape, MeshedShape};
 use truck_modeling::builder::{translated, tsweep, vertex};
@@ -12,6 +12,8 @@ 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/idwrap.rs b/packages/cadmium/src/message/idwrap.rs
deleted file mode 100644
index c3d275d1..00000000
--- a/packages/cadmium/src/message/idwrap.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use std::fmt;
-
-use serde::de::{self, MapAccess, Visitor};
-use serde::ser::SerializeMap;
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
-use tsify_next::Tsify;
-
-use crate::IDType;
-
-use super::{Identifiable, MessageHandler, ProjectMessageHandler};
-
-#[derive(Tsify, Debug, Clone)]
-#[tsify(from_wasm_abi)]
-pub struct IDWrap<T: Serialize + for<'de> Deserialize<'de> + wasm_bindgen::convert::RefFromWasmAbi> {
-    pub id: u64,
-    pub inner: T,
-}
-
-impl<T: Serialize + for<'de> Deserialize<'de> + wasm_bindgen::convert::RefFromWasmAbi> IDWrap<T> {
-    pub fn new(id: IDType, h: T) -> Self {
-        Self {
-            id,
-            inner: h,
-        }
-    }
-
-    pub fn id(&self) -> IDType {
-        self.id
-    }
-
-    pub fn inner(&self) -> &T {
-        &self.inner
-    }
-}
-
-// First level message handler
-impl<T, U> ProjectMessageHandler for IDWrap<T>
-where
-    T: MessageHandler<Parent = U> + Serialize + for<'de> Deserialize<'de> + wasm_bindgen::convert::RefFromWasmAbi,
-    U: Identifiable<Parent = crate::project::Project>,
-{
-    fn handle_project_message(&self, project: &mut crate::project::Project) -> anyhow::Result<Option<IDType>> {
-        let prnt = U::from_parent_id(project, self.id)?;
-        self.inner.handle_message(prnt)
-    }
-}
-
-// Second level message handler
-impl<T, C, P> MessageHandler for IDWrap<T>
-where
-    T: MessageHandler<Parent = C> + Serialize + for<'de> Deserialize<'de> + wasm_bindgen::convert::RefFromWasmAbi,
-    C: Identifiable<Parent = P>,
-    P: Identifiable<Parent = crate::project::Project>,
-{
-    type Parent = C::Parent;
-    fn handle_message(&self, parent: Self::Parent) -> anyhow::Result<Option<IDType>> {
-        let prnt = C::from_parent_id(&parent, self.id)?;
-        self.inner.handle_message(prnt)
-    }
-}
-
-impl<'de, T, C> Deserialize<'de> for IDWrap<T>
-where
-    T: MessageHandler<Parent = C> + 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> + 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>()? {
-                    println!("Key: {:?}", key);
-
-                    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())
-    }
-}
-
-impl<T, C> Serialize for IDWrap<T>
-where
-    T: MessageHandler<Parent = C> + 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/idwrap/de.rs b/packages/cadmium/src/message/idwrap/de.rs
new file mode 100644
index 00000000..f8d826cb
--- /dev/null
+++ b/packages/cadmium/src/message/idwrap/de.rs
@@ -0,0 +1,83 @@
+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
new file mode 100644
index 00000000..21c09f40
--- /dev/null
+++ b/packages/cadmium/src/message/idwrap/mod.rs
@@ -0,0 +1,105 @@
+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
new file mode 100644
index 00000000..70477d0f
--- /dev/null
+++ b/packages/cadmium/src/message/idwrap/ser.rs
@@ -0,0 +1,37 @@
+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
index e201b0bf..31e02f7c 100644
--- a/packages/cadmium/src/message/message.rs
+++ b/packages/cadmium/src/message/message.rs
@@ -2,28 +2,34 @@ use cadmium_macros::MessageEnum;
 use serde::{Deserialize, Serialize};
 use tsify_next::Tsify;
 
-use crate::IDType;
+use crate::step::StepHash;
 
-use super::ProjectMessageHandler;
 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>),
-    WorkbenchPointUpdate(IDWrap<IDWrap<crate::solid::point::WorkbenchPointUpdate>>),
+    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>>),
 
-    SketchAddPoint(IDWrap<IDWrap<crate::isketch::AddPoint>>),
-    SketchAddArc(IDWrap<IDWrap<crate::isketch::AddArc>>),
-    SketchAddCircle(IDWrap<IDWrap<crate::isketch::AddCircle>>),
-    SketchAddLine(IDWrap<IDWrap<crate::isketch::AddLine>>),
-    SketchDeletePrimitive(IDWrap<IDWrap<crate::isketch::DeletePrimitive>>),
+    FeatureExtrusionAdd(IDWrap<crate::feature::extrusion::Add>),
 
-    SolidExtrusionAdd(IDWrap<crate::solid::extrusion::Add>),
+    StepRename(IDWrap<IDWrap<crate::step::actions::Rename>>),
+    StepDelete(IDWrap<crate::step::actions::Delete>),
 }
 
 #[derive(Tsify, Debug, Serialize, Deserialize)]
@@ -33,17 +39,21 @@ pub struct MessageResult {
     pub data: String,
 }
 
-impl From<anyhow::Result<Option<IDType>>> for MessageResult {
-    fn from(result: anyhow::Result<Option<IDType>>) -> Self {
+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() }
+                data: if let Some(id) = msg {
+                    id.to_string()
+                } else {
+                    "null".to_string()
+                },
             },
             Err(e) => Self {
                 success: false,
-                data: e.backtrace().to_string()
+                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
index 1a4f62eb..81efab57 100644
--- a/packages/cadmium/src/message/mod.rs
+++ b/packages/cadmium/src/message/mod.rs
@@ -1,3 +1,4 @@
+use crate::step::{StepHash, StepResult};
 use crate::IDType;
 
 pub mod idwrap;
@@ -5,18 +6,22 @@ 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, id: IDType) -> Result<Self, anyhow::Error>;
+    fn from_parent_id(parent: &Self::Parent, hash: StepHash) -> Result<Self, anyhow::Error>;
 }
 
-pub trait ProjectMessageHandler: wasm_bindgen::convert::RefFromWasmAbi {
-    fn handle_project_message(&self, project: &mut crate::project::Project) -> anyhow::Result<Option<IDType>>;
+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> + wasm_bindgen::convert::RefFromWasmAbi {
+pub trait MessageHandler: Serialize + for<'de> Deserialize<'de> + RefFromWasmAbi {
     type Parent: Identifiable;
-    fn handle_message(&self, item: Self::Parent) -> anyhow::Result<Option<IDType>>;
+    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 3cfa709b..bf6954d8 100644
--- a/packages/cadmium/src/project.rs
+++ b/packages/cadmium/src/project.rs
@@ -1,13 +1,17 @@
 use std::cell::RefCell;
 use std::rc::Rc;
 
+use log::error;
 use serde::{Deserialize, Serialize};
 use tsify_next::Tsify;
 use wasm_bindgen::prelude::*;
 
+use crate::archetypes::Plane;
 use crate::error::CADmiumError;
+use crate::message::idwrap::IDWrap;
 use crate::message::ProjectMessageHandler;
-use crate::workbench::Workbench;
+use crate::step::StepHash;
+use crate::workbench::{AddPlane, AddPoint, Workbench};
 
 #[derive(Tsify, Debug, Serialize, Deserialize)]
 #[tsify(into_wasm_abi, from_wasm_abi)]
@@ -31,12 +35,56 @@ impl Project {
             workbenches: vec![],
         };
 
-        let wb = Workbench::new("Workbench 1");
-        p.workbenches.push(Rc::new(RefCell::new(wb)));
+        p.add_workbench("Workbench 1");
 
         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 {
@@ -50,7 +98,7 @@ impl Project {
         match result {
             Ok(p) => p,
             Err(e) => {
-                println!("Error: {}", e);
+                error!("Error: {}", e);
                 Project::new("Error")
             }
         }
@@ -71,14 +119,19 @@ impl Project {
 
     pub fn get_workbench_by_id(&self, id: u64) -> Result<Rc<RefCell<Workbench>>, CADmiumError> {
         self.workbenches
-            .get(id as usize).cloned()
+            .get(id as usize)
+            .cloned()
             .ok_or(CADmiumError::WorkbenchIDNotFound(id))
     }
 
-    pub fn get_workbench_by_name(&self, name: &str) -> Result<Rc<RefCell<Workbench>>, CADmiumError> {
+    pub fn get_workbench_by_name(
+        &self,
+        name: &str,
+    ) -> Result<Rc<RefCell<Workbench>>, CADmiumError> {
         self.workbenches
             .iter()
-            .find(|wb| wb.borrow().name == name).cloned()
+            .find(|wb| wb.borrow().name == name)
+            .cloned()
             .ok_or(CADmiumError::WorkbenchNameNotFound(name.to_string()))
     }
 }
@@ -90,102 +143,204 @@ pub struct ProjectRename {
 }
 
 impl ProjectMessageHandler for ProjectRename {
-    fn handle_project_message(&self, project: &mut crate::project::Project) -> anyhow::Result<Option<crate::IDType>> {
+    fn handle_project_message(
+        &self,
+        project: &mut crate::project::Project,
+    ) -> anyhow::Result<Option<StepHash>> {
         project.name = self.new_name.clone();
         Ok(None)
     }
 }
 
-
 #[cfg(test)]
 pub mod tests {
 
     use crate::archetypes::PlaneDescription;
-    
-    use crate::isketch::AddLine;
-    use crate::isketch::AddPoint;
+
+    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::solid::extrusion;
-    use crate::solid::extrusion::Direction;
-    use crate::solid::extrusion::Mode;
-    use crate::workbench::AddSketch;
+    use crate::step;
+    use crate::workbench::{AddSketch, SetSketchPlane};
 
     use super::*;
 
+    pub const WORKBENCH_HASH: StepHash = StepHash::from_int(0);
+
     pub fn create_test_project() -> Project {
-        let p = Project::new("Test Project");
-        let wb = p.workbenches.first().unwrap();
+        let mut p = Project::new("Test Project");
         let plane_description = PlaneDescription::PlaneId(0);
-        let sketch_id = AddSketch { plane_description }.handle_message(wb.clone()).unwrap().unwrap();
-        let sketch = wb.borrow().get_sketch_by_id(sketch_id).unwrap();
-
-        let ll = AddPoint { x: 0.0, y: 0.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-        let lr = AddPoint { x: 40.0, y: 0.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-        let ul = AddPoint { x: 0.0, y: 40.0 }.handle_message(sketch.clone()).unwrap().unwrap();
-        let ur = AddPoint { x: 40.0, y: 40.0 }.handle_message(sketch.clone()).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();
-
-        let faces = sketch.borrow().sketch().borrow().get_faces();
-        extrusion::Add { sketch_id, faces, length: 25.0, offset: 0.0, direction: Direction::Normal, mode: Mode::New }.handle_message(wb.clone()).unwrap();
+        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();
 
         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.solids;
+        let solids = &workbench.features;
         println!("solids: {:?}", solids);
 
         assert_eq!(solids.len(), 1);
     }
 
-    // #[test]
-    // fn move_sketch() {
-    //     let mut p = Project::new("Test Project");
-
-    //     let right_plane_id = p.workbenches[0].plane_name_to_id("Right").unwrap();
-
-    //     let message = &Message::SetSketchPlane {
-    //         workbench_id: 0,
-    //         sketch_id: "Sketch-0".to_owned(),
-    //         plane_id: right_plane_id,
-    //     };
-
-    //     let result = p.handle_message(message);
-    //     match result {
-    //         Ok(res) => println!("{}", res),
-    //         Err(e) => println!("{}", e),
-    //     }
-    //     // println!("{:?}", result);
+    #[test]
+    fn move_sketch() {
+        let p = create_test_project();
+        let workbench_ref = p.get_workbench_by_id(0).unwrap();
 
-    //     let realization = p.get_realization(0, 1000);
-    // }
+        SetSketchPlane {
+            sketch_id: 0,
+            plane_description: PlaneDescription::PlaneId(1),
+        }
+        .handle_message(workbench_ref.clone())
+        .unwrap();
+    }
 
-    // #[test]
-    // fn rename_plane() {
-    //     let mut p = create_test_project();
+    #[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::RenameStep {
-    //         workbench_id: 0,
-    //         step_id: 1,
-    //         new_name: "Top-2".to_owned(),
-    //     };
+        step::actions::Rename {
+            new_name: new_name.clone(),
+        }
+        .handle_message(target.clone())
+        .unwrap();
 
-    //     let result = message.handle(&mut p);
-    //     match result {
-    //         Ok(res) => println!("{}", res),
-    //         Err(e) => println!("{}", e),
-    //     }
-    //     // let realization = p.get_realization(0, 1000);
-    // }
+        assert_eq!(target.borrow().name, new_name);
+    }
 
     #[test]
     #[ignore = "uses old filetype"]
diff --git a/packages/cadmium/src/step.rs b/packages/cadmium/src/step.rs
deleted file mode 100644
index 8cdc3056..00000000
--- a/packages/cadmium/src/step.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::fmt::Display;
-
-use serde::{Deserialize, Serialize};
-use tsify_next::Tsify;
-use wasm_bindgen::prelude::*;
-
-use crate::message::Message;
-use crate::IDType;
-
-#[derive(Tsify, Clone, Debug, Serialize, Deserialize)]
-#[tsify(into_wasm_abi, from_wasm_abi)]
-pub struct Step {
-    pub(crate) id: IDType,
-    pub(crate) name: String,
-    pub(crate) suppressed: bool,
-    pub(crate) data: Message,
-}
-
-impl Step {
-    pub fn new(id: IDType, data: Message) -> Self {
-        Step {
-            id,
-            name: "TODO".to_string(),
-            suppressed: false,
-            data,
-        }
-    }
-
-    pub fn unique_id(&self) -> String {
-        format!("{}", self)
-    }
-}
-
-impl Display for Step {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}:{}-{}", self.name, self.data, self.id)
-    }
-}
diff --git a/packages/cadmium/src/step/actions.rs b/packages/cadmium/src/step/actions.rs
new file mode 100644
index 00000000..d4966e5e
--- /dev/null
+++ b/packages/cadmium/src/step/actions.rs
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 00000000..5161b7fe
--- /dev/null
+++ b/packages/cadmium/src/step/hash.rs
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000..c218f424
--- /dev/null
+++ b/packages/cadmium/src/step/mod.rs
@@ -0,0 +1,66 @@
+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
new file mode 100644
index 00000000..1904bdc0
--- /dev/null
+++ b/packages/cadmium/src/step/result.rs
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 00000000..4678f42d
--- /dev/null
+++ b/packages/cadmium/src/step/sketch_action.rs
@@ -0,0 +1,51 @@
+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 2d628be1..79471218 100644
--- a/packages/cadmium/src/workbench.rs
+++ b/packages/cadmium/src/workbench.rs
@@ -1,13 +1,15 @@
+use log::{debug, info};
 use serde::{Deserialize, Serialize};
 use tsify_next::Tsify;
 use wasm_bindgen::prelude::*;
 
 use crate::archetypes::{Plane, PlaneDescription};
 use crate::error::CADmiumError;
+use crate::feature::point::Point3;
+use crate::feature::solid::Solid;
+use crate::feature::Feature;
 use crate::isketch::ISketch;
-use crate::solid::point::Point3;
-use crate::solid::Solid;
-use crate::step::Step;
+use crate::step::{Step, StepHash, StepResult};
 use crate::IDType;
 
 use crate::message::*;
@@ -20,7 +22,7 @@ use std::rc::Rc;
 #[tsify(into_wasm_abi, from_wasm_abi)]
 pub struct Workbench {
     pub name: String,
-    pub history: Vec<Step>,
+    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>>>,
@@ -31,34 +33,27 @@ pub struct Workbench {
 
     pub sketches: BTreeMap<IDType, Rc<RefCell<ISketch>>>,
     pub sketches_next_id: IDType,
-    pub solids: BTreeMap<IDType, Rc<RefCell<Solid>>>,
-    pub solids_next_id: IDType,
+    pub features: BTreeMap<IDType, Rc<RefCell<Feature>>>,
+    pub features_next_id: IDType,
 }
 
 impl Workbench {
     pub fn new(name: &str) -> Self {
-        println!("Creating new workbench: {:?}", name);
-        let mut wb = Workbench {
+        info!("Creating new workbench: {}", name);
+        Workbench {
             name: name.to_owned(),
             history: vec![],
 
             points: BTreeMap::new(),
-            points_next_id: 1,
+            points_next_id: 0,
             planes: BTreeMap::new(),
-            planes_next_id: 3,
+            planes_next_id: 0,
 
             sketches: BTreeMap::new(),
             sketches_next_id: 0,
-            solids: BTreeMap::new(),
-            solids_next_id: 0,
-        };
-
-        wb.points.insert(0, Rc::new(RefCell::new(Point3::new(0.0, 0.0, 0.0))));
-        wb.planes.insert(0, Rc::new(RefCell::new(Plane::front())));
-        wb.planes.insert(1, Rc::new(RefCell::new(Plane::front())));
-        wb.planes.insert(2, Rc::new(RefCell::new(Plane::front())));
-
-        wb
+            features: BTreeMap::new(),
+            features_next_id: 0,
+        }
     }
 
     pub fn get_first_plane_id(&self) -> Option<IDType> {
@@ -78,12 +73,39 @@ impl Workbench {
     }
 
     pub fn get_sketch_by_id(&self, id: IDType) -> Result<Rc<RefCell<ISketch>>, CADmiumError> {
-        println!("Getting sketch by id: {:?} {:?}", id, self.sketches);
-        self.sketches.get(&id).ok_or(CADmiumError::SketchIDNotFound(id)).cloned()
+        self.sketches
+            .get(&id)
+            .ok_or(CADmiumError::SketchIDNotFound(id))
+            .cloned()
+    }
+
+    pub fn add_message_step(&mut self, message: &Message, node: StepResult) {
+        self.history
+            .push(Rc::new(RefCell::new(Step::new(message.clone(), node))));
+    }
+
+    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<_>>()
+        );
+        self.history
+            .iter()
+            .find(|step| step.borrow().hash() == hash)
+            .cloned()
     }
 
-    pub fn add_message_step(&mut self, message: &Message) {
-        self.history.push(Step::new(self.history.len() as IDType, message.clone()));
+    // TODO: Remove
+    pub fn get_solids(&self) -> Vec<Solid> {
+        self.features
+            .values()
+            .map(|feature| feature.borrow().as_solid_like().to_solids().unwrap())
+            .flatten()
+            .collect()
     }
 }
 
@@ -91,7 +113,11 @@ impl Identifiable for Rc<RefCell<Workbench>> {
     type Parent = crate::project::Project;
     const ID_NAME: &'static str = "workbench_id";
 
-    fn from_parent_id(parent: &crate::project::Project, id: IDType) -> anyhow::Result<Self> {
+    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)?)
     }
 }
@@ -113,41 +139,48 @@ impl Identifiable for Rc<RefCell<Workbench>> {
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(from_wasm_abi, into_wasm_abi)]
 pub struct AddPoint {
-    x: f64,
-    y: f64,
-    z: f64,
+    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>> {
+    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;
-        wb.points.insert(new_id, Rc::new(RefCell::new(Point3::new(self.x, self.y, self.z))));
+        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))
+        Ok(Some((new_id, StepResult::Point(point))))
     }
 }
 
-
 #[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
 #[tsify(from_wasm_abi, into_wasm_abi)]
 pub struct AddPlane {
-    plane: Plane,
-    width: f64,
-    height: f64,
+    pub plane: Plane,
+    pub width: f64,
+    pub height: f64,
 }
 
 impl MessageHandler for AddPlane {
     type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(&self, sketch_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
+    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;
-        wb.planes.insert(new_id, Rc::new(RefCell::new(self.plane.clone())));
+        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))
+        Ok(Some((new_id, StepResult::Plane(plane))))
     }
 }
 
@@ -159,16 +192,18 @@ pub struct AddSketch {
 
 impl MessageHandler for AddSketch {
     type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(&self, workbench_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
+    fn handle_message(
+        &self,
+        workbench_ref: Self::Parent,
+    ) -> anyhow::Result<Option<(IDType, StepResult)>> {
         let mut wb = workbench_ref.borrow_mut();
-
-        println!("Adding sketch with plane description: {:?}", self.plane_description);
         let sketch = ISketch::try_from_plane_description(&wb, &self.plane_description)?;
+
         let new_id = wb.sketches_next_id;
-        wb.sketches.insert(new_id, Rc::new(RefCell::new(sketch)));
-        println!("Added sketch with id: {:?}", wb.sketches);
+        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))
+        Ok(Some((new_id, StepResult::Sketch(sketch_cell.clone()))))
     }
 }
 
@@ -180,9 +215,49 @@ pub struct WorkbenchRename {
 
 impl MessageHandler for WorkbenchRename {
     type Parent = Rc<RefCell<Workbench>>;
-    fn handle_message(&self, workbench_ref: Self::Parent) -> anyhow::Result<Option<IDType>> {
+    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)
     }
 }
+
+#[derive(Tsify, Debug, Clone, Serialize, Deserialize)]
+#[tsify(from_wasm_abi, into_wasm_abi)]
+pub struct SetSketchPlane {
+    pub sketch_id: IDType,
+    pub plane_description: PlaneDescription,
+}
+
+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"),
+        }
+        .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;
+
+        Ok(None)
+    }
+}
diff --git a/packages/shared/cadmium-api.ts b/packages/shared/cadmium-api.ts
index 3a6d7c0e..ca4c9dc9 100644
--- a/packages/shared/cadmium-api.ts
+++ b/packages/shared/cadmium-api.ts
@@ -1,65 +1,100 @@
-import { Direction, IDType, MessageResult, Mode, Plane, PlaneDescription } from "cadmium";
-import { sendWasmMessage } from "./projectUtils";
+// 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"
 
-interface ProjectRename { new_name: string };
+export interface ProjectRename { new_name: string;  }
 export function projectRename(new_name: string): MessageResult {
-	const message: Message = { ProjectRename: { new_name } }
-	return sendWasmMessage(message)
-}
-interface WorkbenchRename { workbench_id: IDType, new_name: string };
-export function workbenchRename(workbench_id: IDType, new_name: string): MessageResult {
-	const message: Message = { WorkbenchRename: { workbench_id,  new_name } }
-	return sendWasmMessage(message)
-}
-interface WorkbenchPointAdd { workbench_id: IDType, x: number, y: number, z: number };
-export function workbenchPointAdd(workbench_id: IDType, x: number, y: number, z: number): MessageResult {
-	const message: Message = { WorkbenchPointAdd: { workbench_id,  x, y, z } }
-	return sendWasmMessage(message)
-}
-interface WorkbenchPlaneAdd { workbench_id: IDType, plane: Plane, width: number, height: number };
-export function workbenchPlaneAdd(workbench_id: IDType, plane: Plane, width: number, height: number): MessageResult {
-	const message: Message = { WorkbenchPlaneAdd: { workbench_id,  plane, width, height } }
-	return sendWasmMessage(message)
-}
-interface WorkbenchSketchAdd { workbench_id: IDType, plane_description: PlaneDescription };
-export function workbenchSketchAdd(workbench_id: IDType, plane_description: PlaneDescription): MessageResult {
-	const message: Message = { WorkbenchSketchAdd: { workbench_id,  plane_description } }
-	return sendWasmMessage(message)
-}
-interface WorkbenchPointUpdate { workbench_id: IDType, point_id: IDType, x: number, y: number, z: number };
-export function workbenchPointUpdate(workbench_id: IDType, point_id: IDType, x: number, y: number, z: number): MessageResult {
-	const message: Message = { WorkbenchPointUpdate: { workbench_id,  point_id,  x, y, z } }
-	return sendWasmMessage(message)
-}
-interface SketchAddPoint { workbench_id: IDType, sketch_id: IDType, x: number, y: number, z: number };
-export function sketchAddPoint(workbench_id: IDType, sketch_id: IDType, x: number, y: number, z: number): MessageResult {
-	const message: Message = { SketchAddPoint: { workbench_id,  sketch_id,  x, y, z } }
-	return sendWasmMessage(message)
-}
-interface SketchAddArc { workbench_id: IDType, sketch_id: IDType, center: IDType, radius: number, clockwise: boolean, start_angle: number, end_angle: number };
-export function sketchAddArc(workbench_id: IDType, sketch_id: IDType, center: IDType, radius: number, clockwise: boolean, start_angle: number, end_angle: number): MessageResult {
-	const message: Message = { SketchAddArc: { workbench_id,  sketch_id,  center, radius, clockwise, start_angle, end_angle } }
-	return sendWasmMessage(message)
-}
-interface SketchAddCircle { workbench_id: IDType, sketch_id: IDType, center: IDType, radius: number };
-export function sketchAddCircle(workbench_id: IDType, sketch_id: IDType, center: IDType, radius: number): MessageResult {
-	const message: Message = { SketchAddCircle: { workbench_id,  sketch_id,  center, radius } }
-	return sendWasmMessage(message)
-}
-interface SketchAddLine { workbench_id: IDType, sketch_id: IDType, start: IDType, end: IDType };
-export function sketchAddLine(workbench_id: IDType, sketch_id: IDType, start: IDType, end: IDType): MessageResult {
-	const message: Message = { SketchAddLine: { workbench_id,  sketch_id,  start, end } }
-	return sendWasmMessage(message)
-}
-interface SketchDeletePrimitive { workbench_id: IDType, sketch_id: IDType, primitive_id: IDType };
-export function sketchDeletePrimitive(workbench_id: IDType, sketch_id: IDType, primitive_id: IDType): MessageResult {
-	const message: Message = { SketchDeletePrimitive: { workbench_id,  sketch_id, primitive_id } }
-	return sendWasmMessage(message)
-}
-interface SolidExtrusionAdd { workbench_id: IDType, sketch_id: IDType, faces: Face[], length: number, offset: number, direction: Direction, mode: Mode };
-export function solidExtrusionAdd(workbench_id: IDType, sketch_id: IDType, faces: Face[], length: number, offset: number, direction: Direction, mode: Mode): MessageResult {
-	const message: Message = { SolidExtrusionAdd: { workbench_id,  sketch_id, faces, length, offset, direction, mode } }
-	return sendWasmMessage(message)
-}
-
-export type Message = { ProjectRename: ProjectRename } | { WorkbenchRename: WorkbenchRename } | { WorkbenchPointAdd: WorkbenchPointAdd } | { WorkbenchPlaneAdd: WorkbenchPlaneAdd } | { WorkbenchSketchAdd: WorkbenchSketchAdd } | { WorkbenchPointUpdate: WorkbenchPointUpdate } | { SketchAddPoint: SketchAddPoint } | { SketchAddArc: SketchAddArc } | { SketchAddCircle: SketchAddCircle } | { SketchAddLine: SketchAddLine } | { SketchDeletePrimitive: SketchDeletePrimitive } | { SolidExtrusionAdd: SolidExtrusionAdd };
+    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
new file mode 100644
index 00000000..314f378c
--- /dev/null
+++ b/packages/shared/isotope.d.ts
@@ -0,0 +1,35 @@
+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 bbb02795..dccf686c 100644
--- a/packages/shared/projectUtils.ts
+++ b/packages/shared/projectUtils.ts
@@ -1,495 +1,337 @@
-import * as cadFunctions from "./cadmium-api"
-(window as any).cad = cadFunctions
-
-import {
-	workbenchIsStale,
-	workbenchIndex,
-	workbench,
-	project,
-	featureIndex,
-	wasmProject,
-	projectIsStale,
-	realizationIsStale,
-	wasmRealization,
-	realization,
-	messageHistory,
-} from "./stores"
+import type {Message} from "./cadmium-api"
+
+import {workbenchIsStale, workbenchIndex, workbench, project, featureIndex, wasmProject, projectIsStale, messageHistory, workbenchSolids} from "./stores"
 import {get} from "svelte/store"
 import {Vector2, Vector3, type Vector2Like} from "three"
-import type {
-	Entity,
-	ExtrusionHistoryStep,
-	HistoryStep,
-	MessageHistory,
-	PlaneHistoryStep,
-	PointHistoryStep,
-	SketchHistoryStep,
-	WithTarget,
-	WorkBench
-} from "./types"
-import type { Realization as WasmRealization, Primitive, StepData, Workbench, MessageResult } from "cadmium"
-import type { Message } from "./cadmium-api"
-import { isMessage } from "./typeGuards"
-// import { isDevelopment } from "../+layout"
+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 }
 
 // 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
 
-export function isPoint(feature: HistoryStep): feature is PointHistoryStep {
-	return feature.data.type === "Point"
+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 isPlane(feature: HistoryStep): feature is PlaneHistoryStep {
-	return feature.data.type === "Plane"
+export function isPlane(node: Node): node is Node & Plane {
+  return "Plane" in node
 }
-export function isExtrusion(feature: HistoryStep): feature is ExtrusionHistoryStep {
-	return feature.data.type === "Extrusion"
+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 isSketch(feature: HistoryStep): feature is SketchHistoryStep {
-	return feature.data.type === "Sketch"
+export function isSolid(node: Node): node is Node & Solid[] {
+  return "Solid" in node
 }
 
 export function arraysEqual(a: any[], b: any[]) {
-	if (a.length !== b.length) return false
-	for (let i = 0; i < a.length; i++) {
-		if (a[i] !== b[i]) return false
-	}
-	return true
+  if (a.length !== b.length) return false
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false
+  }
+  return true
 }
 
 export function sendWasmMessage(message: Message): MessageResult {
-	let wp = get(wasmProject)
-	log("[sendWasmMessage] sending message:", message)
-	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}]
-	})
-	return result
+  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)
+  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[]) {
-	const message: Message = {
-		UpdateExtrusion: {
-			workbench_id: get(workbenchIndex),
-			sketch_id: sketchId,
-			face_ids: faceIds.map(id => +id), // on browser side ids are strings - coerce face ids to numbers here to suit rust
-			length,
-			offset: 0.0,
-			extrusion_name: "Extra",
-			direction: "Normal",
-			extrusion_id: extrusionId,
-		},
-	}
-	const isValid = checkWasmMessage(message)
-	const hasFaceIds = notEmpty(message.UpdateExtrusion.face_ids)
-	if (isValid) {
-		sendWasmMessage(message)
-		workbenchIsStale.set(true)
-		if (hasFaceIds) {
-			log("[updateExtrusion]", "[checkWasmMessage]", "is valid,", "sending message...", message)
-			// sendWasmMessage(message)
-		} else log("[updateExtrusion]", "[checkWasmMessage]", "is valid,", "but face_ids is empty,", "NOT sending message:", message)
-	} else log("[updateExtrusion]", "[checkWasmMessage]", "is bogus,", "abort message send!", message)
-
-	// sendWasmMessage(message)
-
-	// should this be set stale when not sending the wasm message? todo
-	// workbenchIsStale.set(true)
+  const message: Message = {
+    UpdateExtrusion: {
+      workbench_id: get(workbenchIndex),
+      sketch_id: sketchId,
+      face_ids: faceIds.map(id => +id), // on browser side ids are strings - coerce face ids to numbers here to suit rust
+      length,
+      offset: 0.0,
+      extrusion_name: "Extra",
+      direction: "Normal",
+      extrusion_id: extrusionId,
+    },
+  }
+  const isValid = checkWasmMessage(message)
+  const hasFaceIds = notEmpty(message.UpdateExtrusion.face_ids)
+  if (isValid) {
+    sendWasmMessage(message)
+    workbenchIsStale.set(true)
+    if (hasFaceIds) {
+      log("[updateExtrusion]", "[checkWasmMessage]", "is valid,", "sending message...", message)
+      // sendWasmMessage(message)
+    } else log("[updateExtrusion]", "[checkWasmMessage]", "is valid,", "but face_ids is empty,", "NOT sending message:", message)
+  } else log("[updateExtrusion]", "[checkWasmMessage]", "is bogus,", "abort message send!", message)
+
+  // sendWasmMessage(message)
+
+  // should this be set stale when not sending the wasm message? todo
+  // workbenchIsStale.set(true)
 }
 
 export function setSketchPlane(sketchId: number, planeId: number) {
-	const message: Message = {
-		SetSketchPlane: {
-			workbench_id: get(workbenchIndex),
-			sketch_id: sketchId,
-			plane_id: planeId
-		}
-	}
-	checkWasmMessage(message)
-	sendWasmMessage(message)
+  return cad.workbenchSketchSetPlane(get(workbenchIndex).toString(), sketchId, {PlaneId: planeId})
 }
 
 export function newSketchOnPlane() {
-	const message: Message = {
-		StepAction: {
-			name: "",
-			data: {
-				workbench_id: get(workbenchIndex),
-				plane_id: "", // leave it floating at first
-			}
-		}
-	}
-	checkWasmMessage(message)
-	sendWasmMessage(message)
+  // TODO: Why are we defaulting to plane 0?
+  cad.workbenchSketchAdd(get(workbenchIndex).toString(), {PlaneId: 0})
 }
 
 export function newExtrusion() {
-	const bench: Workbench = get(workbench)
-	// log("[newExtrusion] workbench:", workbench)
-	// log("[newExtrusion] bench:", bench)
-
-	let sketchId = ""
-	for (let step of bench.history) {
-		if (step.data.type === "Sketch") {
-			sketchId = step.unique_id
-		}
-	}
-	if (sketchId === "") {
-		log("No sketch found in history")
-		return
-	}
-
-	const message: Message = {
-		StepAction: {
-			data: {
-				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)
+  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")
+    }
+  }
+
+  throw new Error("No sketch faces found to extrude")
 }
 
 export function deleteEntities(sketchIdx: string, selection: Entity[]) {
-	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)
-}
+  const workbenchIdx = get(workbenchIndex).toString()
 
-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)
+  // TODO: Handle compounds as well
+  for (const entity of selection) {
+    cad.sketchDeletePrimitive(workbenchIdx, sketchIdx, parseInt(entity.id))
+  }
 }
 
-export function addCircleBetweenPoints(sketchIdx: string, point1: string, point2: string) {
-	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)
+export function addRectangleBetweenPoints(sketchIdx: string, point1: string, point2: string) {
+  return cad.sketchAddRectangle(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)
+export function addCircleBetweenPoints(sketchIdx: string, point1: string, point2: string) {
+  return cad.sketchAddCircle(get(workbenchIndex).toString(), sketchIdx, point1, point2)
 }
 
-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.data).id
+export function addLineToSketch(sketchIdx: string, point1: string, point2: string) {
+  return cad.sketchAddLine(get(workbenchIndex).toString(), sketchIdx, point1, point2)
 }
 
-export function addPrimitiveToSketch(sketchIdx: string, primitive: Primitive): number {
-	const message: Message = {
-		AddSketchPrimitive: {
-			workbench_id: get(workbenchIndex),
-			sketch_id: sketchIdx,
-			primitive
-		}
-	}
-	checkWasmMessage(message)
-	const reply = sendWasmMessage(message)
-
-	if (!reply.success)
-		console.error("ERROR [projectUtils.ts addPrimitiveToSketch sendWasmMessage]", "message:", message, "reply:", reply)
-
-	return JSON.parse(reply.data).id
+export function addPointToSketch(sketchIdx: string, point: Vector2Like, hidden: boolean): StepHash {
+  return cad.sketchAddPoint(get(workbenchIndex).toString(), sketchIdx, point.x, point.y).data
 }
 
-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 renameStep(stepIdx: string, newName: string): void {
+  cad.stepRename(get(workbenchIndex).toString(), stepIdx, newName)
 }
 
 export function renameWorkbench(newName: string): void {
-	log("[renameWorkbench] newName", newName)
-	const message: Message = {
-		RenameWorkbench: {
-			workbench_id: get(workbenchIndex),
-			new_name: newName,
-		},
-	}
-	checkWasmMessage(message)
-	sendWasmMessage(message)
+  cad.workbenchRename(get(workbenchIndex).toString(), newName)
 }
 
 export function renameProject(newName: string): void {
-	log("[renameProject] newName", newName)
-	const message: Message = {
-		RenameProject: {
-			new_name: newName,
-		},
-	}
-	checkWasmMessage(message)
-	sendWasmMessage(message)
+  cad.projectRename(newName)
 }
 
 // If the project ever becomes stale, refresh it. This should be pretty rare.
 projectIsStale.subscribe(value => {
-	if (value) {
-		const wp = get(wasmProject)
-		project.set(JSON.parse(wp.to_json()))
-
-		workbenchIndex.set(0)
-		workbenchIsStale.set(true)
-		projectIsStale.set(false)
-		// @ts-ignore
-		log("[projectIsStale] Refreshing project", "value:", value, "wasmProject:", wp, "project:", project)
-	}
+  if (value) {
+    const wp = get(wasmProject)
+    project.set(JSON.parse(wp.to_json()))
+
+    workbenchIndex.set(0)
+    workbenchIsStale.set(true)
+    projectIsStale.set(false)
+    // @ts-ignore
+    log("[projectIsStale] Refreshing project", "value:", value, "wasmProject:", wp, "project:", project)
+  }
 })
 
 // If the workbench ever becomes stale, refresh it. This should be very common.
 // Every time you edit any part of the feature history, for example
 workbenchIsStale.subscribe(value => {
-	if (value) {
-		log("[workbenchIsStale] Workbench:", get(workbench))
-		const workbenchIdx = get(workbenchIndex)
-		const wasmProj = get(wasmProject)
-		const workbenchJson = wasmProj.get_workbench(workbenchIdx)
-		// TODO: reach inside of project and set its representation
-		// of the workbench to the new one that we just got
-		workbench.set(workbenchJson)
-		workbenchIsStale.set(false)
-		// 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)
-	}
+  if (value) {
+    log("[workbenchIsStale] Workbench:", get(workbench))
+    const workbenchIdx = get(workbenchIndex)
+    const wasmProj = get(wasmProject)
+    const workbenchJson = wasmProj.get_workbench(workbenchIdx)
+    workbench.set(workbenchJson)
+    workbenchIsStale.set(false)
+    workbenchSolids.set(getWorkbenchSolids())
+  }
 })
 
 export function getObjectString(solidId: string): string {
-	// log("[getObjectString] solidId:", solidId)
-	const wasmReal = get(wasmRealization)
-	const objString = wasmReal.solid_to_obj(solidId, 0.1)
-	return objString
+  const solids = get(workbenchSolids)
+  // TODO: Does this work?
+  const objString = solids[solidId].solid_to_obj(solidId, 0.1)
+  return objString
 }
 
 export function readFile(e: WithTarget<Event, HTMLInputElement>): void {
-	const target = e.target as HTMLInputElement
-	const file = target.files![0]
-	const reader = new FileReader()
-	reader.onload = function (e) {
-		// log("[readFile] file contents", e.target?.result)
-	}
-	reader.readAsText(file)
+  const target = e.target as HTMLInputElement
+  const file = target.files![0]
+  const reader = new FileReader()
+  reader.onload = function (e) {
+    // log("[readFile] file contents", e.target?.result)
+  }
+  reader.readAsText(file)
 }
 
 export function arcToPoints(center: Vector2, start: Vector2, end: Vector2, clockwise: boolean = false): Vector2[] {
-	// log("[arcToPoints] center, start, end, clockwise", center, start, end, clockwise)
-	// see https://math.stackexchange.com/a/4132095/816177
-	const tolerance = CIRCLE_TOLERANCE // in meters
-	const radius = start.distanceTo(center)
-	const k = tolerance / radius
-	// more precise but slower to calculate:
-	// const n = Math.ceil(Math.PI / Math.acos(1 - k))
-	// faster to calculate, at most only overestimates by 1:
-	let n = Math.ceil(Math.PI / Math.sqrt(2 * k))
-	const segmentAngle = (2 * Math.PI) / n
-	const segmentLength = radius * segmentAngle
-	if (clockwise) n = -n
-
-	const startAngle = Math.atan2(start.y - center.y, start.x - center.x)
-
-	const lineVertices: Vector2[] = []
-	lineVertices.push(start.clone())
-	for (let i = 1; i <= Math.abs(n); i++) {
-		const theta = ((2 * Math.PI) / n) * i + startAngle
-		const xComponent = radius * Math.cos(theta)
-		const yComponent = radius * Math.sin(theta)
-		const point = new Vector2(xComponent, yComponent).add(center)
-		lineVertices.push(point)
-
-		const distanceToEnd = point.distanceTo(end)
-		if (distanceToEnd <= segmentLength) {
-			lineVertices.push(end.clone())
-			break
-		}
-	}
-	return lineVertices
+  // log("[arcToPoints] center, start, end, clockwise", center, start, end, clockwise)
+  // see https://math.stackexchange.com/a/4132095/816177
+  const tolerance = CIRCLE_TOLERANCE // in meters
+  const radius = start.distanceTo(center)
+  const k = tolerance / radius
+  // more precise but slower to calculate:
+  // const n = Math.ceil(Math.PI / Math.acos(1 - k))
+  // faster to calculate, at most only overestimates by 1:
+  let n = Math.ceil(Math.PI / Math.sqrt(2 * k))
+  const segmentAngle = (2 * Math.PI) / n
+  const segmentLength = radius * segmentAngle
+  if (clockwise) n = -n
+
+  const startAngle = Math.atan2(start.y - center.y, start.x - center.x)
+
+  const lineVertices: Vector2[] = []
+  lineVertices.push(start.clone())
+  for (let i = 1; i <= Math.abs(n); i++) {
+    const theta = ((2 * Math.PI) / n) * i + startAngle
+    const xComponent = radius * Math.cos(theta)
+    const yComponent = radius * Math.sin(theta)
+    const point = new Vector2(xComponent, yComponent).add(center)
+    lineVertices.push(point)
+
+    const distanceToEnd = point.distanceTo(end)
+    if (distanceToEnd <= segmentLength) {
+      lineVertices.push(end.clone())
+      break
+    }
+  }
+  return lineVertices
 }
 
 export function circleToPoints(centerPoint: Vector2Like, radius: number): Vector2[] {
-	// this is 2D function
-
-	// see https://math.stackexchange.com/a/4132095/816177
-	const tolerance = CIRCLE_TOLERANCE // in meters
-	const k = tolerance / radius
-	// more precise but slower to calculate:
-	// const n = Math.ceil(Math.PI / Math.acos(1 - k))
-	// faster to calculate, at most only overestimates by 1:
-	const n = Math.ceil(Math.PI / Math.sqrt(2 * k))
-
-	const lineVertices: Vector2[] = []
-	for (let i = 0; i <= n; i++) {
-		const theta = ((2 * Math.PI) / n) * i
-		const xComponent = radius * Math.cos(theta)
-		const yComponent = radius * Math.sin(theta)
-		const point = new Vector2(xComponent, yComponent).add(centerPoint)
-		lineVertices.push(point)
-	}
-	return lineVertices
+  // this is 2D function
+
+  // see https://math.stackexchange.com/a/4132095/816177
+  const tolerance = CIRCLE_TOLERANCE // in meters
+  const k = tolerance / radius
+  // more precise but slower to calculate:
+  // const n = Math.ceil(Math.PI / Math.acos(1 - k))
+  // faster to calculate, at most only overestimates by 1:
+  const n = Math.ceil(Math.PI / Math.sqrt(2 * k))
+
+  const lineVertices: Vector2[] = []
+  for (let i = 0; i <= n; i++) {
+    const theta = ((2 * Math.PI) / n) * i
+    const xComponent = radius * Math.cos(theta)
+    const yComponent = radius * Math.sin(theta)
+    const point = new Vector2(xComponent, yComponent).add(centerPoint)
+    lineVertices.push(point)
+  }
+  return lineVertices
 }
 
 export function promoteTo3(points: Vector2[]): Vector3[] {
-	const points3: Vector3[] = []
-	for (const point of points) {
-		points3.push(new Vector3(point.x, point.y, 0))
-	}
-	return points3
+  const points3: Vector3[] = []
+  for (const point of points) {
+    points3.push(new Vector3(point.x, point.y, 0))
+  }
+  return points3
 }
 
 export function flatten(points: Vector3[]): number[] {
-	const pointsFlat: number[] = []
-	for (const point of points) {
-		pointsFlat.push(point.x, point.y, point.z)
-	}
-	return pointsFlat
+  const pointsFlat: number[] = []
+  for (const point of points) {
+    pointsFlat.push(point.x, point.y, point.z)
+  }
+  return pointsFlat
 }
 
 function isStringInt(s: string, errorCallback: {(id: any): void; (arg0: string): void}): boolean {
-	if (typeof s !== "string") console.error("[proectUtils.ts] [isStringInt]", s, "is not a string:", typeof s)
-	const isInt = !Number.isNaN(parseInt(s, 10))
-	if (!isInt) errorCallback(s)
-	return isInt
+  if (typeof s !== "string") console.error("[proectUtils.ts] [isStringInt]", s, "is not a string:", typeof s)
+  const isInt = !Number.isNaN(parseInt(s, 10))
+  if (!isInt) errorCallback(s)
+  return isInt
 }
 
 function reduceToInts(data: string[], errorCallback: (id: any) => void): number[] {
-	function reducer(acc: number[], id: string): number[] {
-		return isStringInt(id, errorCallback) ? [...acc, parseInt(id, 10)] : acc
-	}
-	return data.reduce(reducer, [])
+  function reducer(acc: number[], id: string): number[] {
+    return isStringInt(id, errorCallback) ? [...acc, parseInt(id, 10)] : acc
+  }
+  return data.reduce(reducer, [])
 }
 
 function notEmpty(array: unknown[]): boolean {
-	return array && Array.isArray(array) && array.length > 0
+  return array && Array.isArray(array) && array.length > 0
 }
 
 export function checkWasmMessage(message: Message, abort = true, logError = true): boolean {
-	const key = Object.keys(message)[0]
-	const command = message[key as keyof Message]
-	if (!command) {
-		console.error("[projectUtils.ts] [checkWasmMessage]", "messageType not found:", key, message)
-		return false
-	}
-	log("[checkWasmMessage]", "checking...", key, message)
-
-	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
+  const key = Object.keys(message)[0]
+  const command = message[key as keyof Message]
+  if (!command) {
+    console.error("[projectUtils.ts] [checkWasmMessage]", "messageType not found:", key, message)
+    return false
+  }
+  log("[checkWasmMessage]", "checking...", key, message)
+
+  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/sketch.ts b/packages/shared/sketch.ts
deleted file mode 100644
index 6c21901f..00000000
--- a/packages/shared/sketch.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Message, Primitive } from "cadmium";
-import { get } from "svelte/store";
-import { workbenchIndex } from "./stores";
-import { sendWasmMessage } from "./projectUtils";
-
-export class ISketch {
-	id: string;
-
-	constructor(id: string) {
-		this.id = id
-	}
-
-	addPrimitive(primitive: Primitive): number {
-		const message: Message = {
-			AddSketchPrimitive: {
-				workbench_id: get(workbenchIndex),
-				sketch_id: this.id,
-				primitive
-			}
-		}
-
-		const reply = sendWasmMessage(message)
-
-		if (!reply.success)
-			console.error("ERROR [projectUtils.ts addPrimitiveToSketch sendWasmMessage]", "message:", message, "reply:", reply)
-
-		return JSON.parse(reply.data).id
-	}
-
-	deletePrimitives(ids: number[]) {
-		const message: Message = {
-			DeleteSketchPrimitives: {
-				workbench_id: get(workbenchIndex),
-				sketch_id: this.id,
-				ids
-			}
-		}
-
-		sendWasmMessage(message)
-	}
-
-	setPlane(plane_id: number) {
-		const message: Message = {
-			SetSketchPlane: {
-				workbench_id: get(workbenchIndex),
-				sketch_id: this.id,
-				plane_id: `${plane_id}`
-			}
-		}
-
-		sendWasmMessage(message)
-	}
-
-	addCircle(center: number, external: number): number {
-		return this.addPrimitive({
-			Circle.new()
-		})
-	}
-}
diff --git a/packages/shared/stepTypeGuards.ts b/packages/shared/stepTypeGuards.ts
new file mode 100644
index 00000000..76ea8fce
--- /dev/null
+++ b/packages/shared/stepTypeGuards.ts
@@ -0,0 +1,63 @@
+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 44ede424..ab78da6e 100644
--- a/packages/shared/stores.ts
+++ b/packages/shared/stores.ts
@@ -1,29 +1,25 @@
-import {Project as WasmProject, Realization as WasmRealization, Workbench} from "cadmium"
+import {Solid, StepHash, Project as WasmProject, Workbench} from "cadmium"
 import {writable} from "svelte/store"
-import type {MessageHistory, Project, Realization, Entity, EntityType, SnapEntity, PointLikeById, PreviewGeometry} from "./types"
+import type {MessageHistory, Project, Entity, EntityType, SnapEntity, PointLikeById, PreviewGeometry, Point2WithID} 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};`) })()
 
-// @ts-ignore
-export const wasmProject = writable<WasmProject>({})
+export const wasmProject = writable<WasmProject>({} as 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 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<string[]>([])
-export const sketchBeingEdited = writable("")
+export const hiddenSketches = writable<StepHash[]>([])
+export const sketchBeingEdited = writable<StepHash | null>(null)
 export const sketchTool = writable("")
 
 // could be looking for 'face' or 'plane' or other things
@@ -33,20 +29,17 @@ export const selectionMin = writable(0)
 
 export const currentlyMousedOver = writable<SnapEntity[]>([])
 export const currentlySelected = writable<Entity[]>([])
-export const snapPoints = writable<PointLikeById[]>([])
+export const snapPoints = writable<Point2WithID[]>([])
 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))
 
@@ -65,7 +58,6 @@ 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]
@@ -94,16 +86,18 @@ function latestIsEntity(store: Entity[], type: EntityType) {
   return [false, null]
 }
 
-function emptyWorkBench(): WorkBench {
+function emptyWorkBench(): Workbench {
   return {
     name: "",
     history: [],
-    step_counters: {
-      Extrusion: 0,
-      Plane: 0,
-      Point: 0,
-      Sketch: 0,
-    },
+    points: [],
+    points_next_id: 0,
+    sketches: [],
+    sketches_next_id: 0,
+    planes: [],
+    planes_next_id: 0,
+    features: [],
+    features_next_id: 0,
   }
 }
 function emptyProject(): Project {
@@ -113,11 +107,3 @@ 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 4dbba072..19d02d31 100644
--- a/packages/shared/typeGuards.ts
+++ b/packages/shared/typeGuards.ts
@@ -1,3 +1,4 @@
+import { IDType, PlaneDescription } from "cadmium"
 import type {
   IDictionary,
   WithTarget,
@@ -1066,3 +1067,13 @@ 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 a28d547b..fba0a9c0 100644
--- a/packages/shared/types.d.ts
+++ b/packages/shared/types.d.ts
@@ -1,10 +1,16 @@
-import { Message, MessageResult, Workbench } from "cadmium"
+import { MessageResult, Point2, StepHash, Workbench } from "cadmium"
+import { Message } from "./cadmium-api"
 import type { Vector2, Vector3, Vector2Like, Vector3Like } from "three"
 
-interface IDictionary<TValue> {
+export 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
@@ -129,19 +135,6 @@ 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"
@@ -347,9 +340,9 @@ interface ExtrusionSketchData {
 
 interface PreviewGeometry {
   type: EntityType
-  start?: PointLikeById
-  end?: PointLikeById
-  center?: PointLikeById
+  start?: Point2
+  end?: Point2
+  center?: Point2
   radius?: number
   x?: number
   y?: number
@@ -376,7 +369,7 @@ interface PointLikeById {
   [x: string]: any // hack todo fix
   twoD?: Vector2Like | Vector2 | Point2D
   threeD?: Vector3Like | Vector3 | Point3D
-  id?: string | null
+  id?: StepHash | null
 }
 
 type PointsById = IDictionary<PointById>