diff --git a/package-lock.json b/package-lock.json
index 997c9c5..edfc31d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
       },
       "devDependencies": {
         "@biomejs/biome": "^1.8.3",
-        "@tscircuit/3d-viewer": "^0.0.13",
+        "@tscircuit/3d-viewer": "^0.0.16",
         "@tscircuit/builder": "^1.5.149",
         "@tscircuit/react-fiber": "^1.0.39",
         "@tscircuit/soup-util": "^0.0.15",
@@ -3035,9 +3035,9 @@
       }
     },
     "node_modules/@tscircuit/3d-viewer": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/@tscircuit/3d-viewer/-/3d-viewer-0.0.13.tgz",
-      "integrity": "sha512-o/LBEeGimzRF4UFPsjlG63W7/khziaxeXrKygYFSM4WNvgAuyYWU5LfMc9Heha3AM0rhcijOFUSmHBcHQaWVqg==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/@tscircuit/3d-viewer/-/3d-viewer-0.0.16.tgz",
+      "integrity": "sha512-K0s1v6me1W1C7t51B5nPYephhmnyMukUJ+6cWu+LpbVCsXxzhvNKbxes4lbI0vjyCpIxL7kzxXkaAY7zwYj7tA==",
       "dev": true,
       "dependencies": {
         "@jscad/modeling": "^2.12.2",
@@ -3045,7 +3045,13 @@
         "@jscad/stl-serializer": "^2.1.17",
         "@react-three/drei": "^9.107.2",
         "@react-three/fiber": "^8.16.8",
+        "@tscircuit/builder": "^1.9.0",
+        "@tscircuit/react-fiber": "^1.1.29",
+        "@tscircuit/soup": "^0.0.39",
+        "@tscircuit/soup-util": "^0.0.15",
         "@types/three": "^0.165.0",
+        "jscad-fiber": "^0.0.38",
+        "jscad-planner": "^0.0.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-use-gesture": "^9.1.3",
@@ -3053,6 +3059,17 @@
         "three-stdlib": "^2.30.3"
       }
     },
+    "node_modules/@tscircuit/3d-viewer/node_modules/@tscircuit/soup": {
+      "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@tscircuit/soup/-/soup-0.0.39.tgz",
+      "integrity": "sha512-22AaLOEtNs871XuRprfgTFsFq2Rp/DVKaW3XzXsh9O0PDjGuPzqsBhPIBy9Em94B5R3yXZMOIprCbTFOvPDAJA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "convert-units": "^2.3.4",
+        "zod": "^3.23.6"
+      }
+    },
     "node_modules/@tscircuit/builder": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/@tscircuit/builder/-/builder-1.10.0.tgz",
@@ -6061,6 +6078,58 @@
       "version": "4.0.0",
       "license": "MIT"
     },
+    "node_modules/jscad-fiber": {
+      "version": "0.0.38",
+      "resolved": "https://registry.npmjs.org/jscad-fiber/-/jscad-fiber-0.0.38.tgz",
+      "integrity": "sha512-HKNxXiMOlxcANKQNywor6pA+whoBGtOhHfr4fUz9Zzbswjhz+M8vuEJn2QiD0yLEWnl+oYg3eiFq5Tb05Q+60g==",
+      "dev": true,
+      "dependencies": {
+        "color": "^4.2.3",
+        "react-reconciler": "^0.29.2"
+      },
+      "peerDependencies": {
+        "@jscad/modeling": "*",
+        "@react-three/fiber": "*",
+        "react": "*",
+        "three": "*"
+      }
+    },
+    "node_modules/jscad-fiber/node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=12.5.0"
+      }
+    },
+    "node_modules/jscad-fiber/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jscad-planner": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/jscad-planner/-/jscad-planner-0.0.2.tgz",
+      "integrity": "sha512-0m/FR/OLCdu96GFwjtZ2dI+pUz8C2+wo6QECUptZ0XxBwKgyshIPHdUTNPKEyrPMuvgvoH0TNcviqMclpfHgVw==",
+      "dev": true,
+      "peerDependencies": {
+        "typescript": "^5.0.0"
+      }
+    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7528,17 +7597,19 @@
       }
     },
     "node_modules/react-reconciler": {
-      "version": "0.29.0",
+      "version": "0.29.2",
+      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.29.2.tgz",
+      "integrity": "sha512-zZQqIiYgDCTP/f1N/mAR10nJGrPD2ZR+jDSEsKWJHYC7Cm2wodlwbR3upZRdC3cjIjSlTLNVyO7Iu0Yy7t2AYg==",
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "engines": {
         "node": ">=0.10.0"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
     "node_modules/react-supergrid": {
diff --git a/package.json b/package.json
index c77b197..4e9b955 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.8.3",
-    "@tscircuit/3d-viewer": "^0.0.13",
+    "@tscircuit/3d-viewer": "^0.0.16",
     "@tscircuit/builder": "^1.5.149",
     "@tscircuit/react-fiber": "^1.0.39",
     "@tscircuit/soup-util": "^0.0.15",