Make a separate WASM prep step for windows

2023-10-16 18:45:25 -04:00
180 changed files with 6845 additions and 12014 deletions
--- a/.codespellrc
+++ b/.codespellrc
@ -1,3 +0,0 @@
-[codespell]
-ignore-words-list: crate,everytime
-skip: **/target,node_modules,build
--- a/.eslintrc
+++ b/.eslintrc
@ -11,7 +11,6 @@
      "semi": [
        "error",
        "never"
-      ],
-      "react-hooks/exhaustive-deps": "off"
+      ]
    }
 }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -12,32 +12,27 @@ on:
  # Daily at 04:00 AM UTC
  # Will checkout the last commit from the default branch (main as of 2023-10-04)

-env:
-  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && contains(github.event.pull_request.title, 'Cut release v') }}
-
 concurrency:
  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
  cancel-in-progress: true
-
 jobs:
  check-format:
-    runs-on: 'ubuntu-latest'
+    runs-on: 'ubuntu-20.04'
    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
      - run: yarn install
      - run: yarn fmt-check

-
  check-types:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04

    steps:
      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
@ -49,27 +44,12 @@ jobs:
      - run: yarn build:wasm
      - run: yarn tsc

-
-  check-typos: 
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Python
-        uses: actions/setup-python@v4
-      - name: Install codespell
-        run: |
-            python -m pip install codespell
-      - name: Run codespell
-        run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
-
-
  build-test-web:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v4

-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
@ -88,25 +68,24 @@ jobs:

      - run: yarn test:cov

-
  prepare-json-files:
-    runs-on: ubuntu-latest  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
+    runs-on: ubuntu-20.04 # seperate job on Ubuntu for easy string manipulations (compared to Windows)
    outputs:
      version: ${{ steps.export_version.outputs.version }}
    steps:
      - uses: actions/checkout@v4

-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn'
-          
+
      - name: Set nightly version
        if: github.event_name == 'schedule'
        run: |
          VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
-          echo "$(jq --arg url 'https://dl.kittycad.io/releases/modeling-app/nightly/last_update.json' \
-            '.tauri.updater.endpoints[]=$url' src-tauri/tauri.release.conf.json --indent 2)" > src-tauri/tauri.release.conf.json
+          echo "$(jq --arg url 'https://dl.kittycad.io/releases/modeling-app/test/nightly/last_update.json' \
+            '.tauri.updater.endpoints[]=$url' src-tauri/tauri.conf.json --indent 2)" > src-tauri/tauri.conf.json

      - uses: actions/upload-artifact@v3
        if: github.event_name == 'schedule'
@ -114,18 +93,16 @@ jobs:
          path: |
            package.json
            src-tauri/tauri.conf.json
-            src-tauri/tauri.release.conf.json

      - id: export_version
        run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"

-
-  build-test-apps:
-    needs: [prepare-json-files]
+  build-apps:
+    needs: [check-format, build-test-web, prepare-json-files, check-types]
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-20.04, windows-latest]
    steps:
      - uses: actions/checkout@v4

@ -137,32 +114,25 @@ jobs:
          ls -l artifact
          cp artifact/package.json package.json
          cp artifact/src-tauri/tauri.conf.json src-tauri/tauri.conf.json
-          cp artifact/src-tauri/tauri.release.conf.json src-tauri/tauri.release.conf.json 

-      - name: Install ubuntu system dependencies
-        if: matrix.os == 'ubuntu-latest'
-        run: >
-          sudo apt-get update &&
-          sudo apt-get install -y
-          libgtk-3-dev
-          libgtksourceview-3.0-dev
-          webkit2gtk-4.0
-          libappindicator3-dev
-          webkit2gtk-driver
-          xvfb
+      - name: install ubuntu system dependencies
+        if: matrix.os == 'ubuntu-20.04'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev

      - name: Sync node version and setup cache
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version-file: '.nvmrc'
          cache: 'yarn' # Set this to npm, yarn or pnpm.

      - run: yarn install

-      - name: Setup Rust
+      - name: Rust setup
        uses: dtolnay/rust-toolchain@stable

-      - name: Setup Rust cache
+      - name: Rust cache
        uses: swatinem/rust-cache@v2
        with:
          workspaces: './src-tauri -> target'
@ -171,27 +141,34 @@ jobs:
        with:
          workspaces: './src/wasm-lib'

-      - name: Run build:wasm manually
+      - name: wasm prep - linux/mac
+        if: matrix.os != 'windows-latest'
        shell: bash
-        env:
-          MODE: ${{ env.BUILD_RELEASE == 'true' && '--release' || '--debug' }}
        run: |
          mkdir src/wasm-lib/pkg; cd src/wasm-lib
-          echo "building with ${{ env.MODE }}"
-          npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
+          npx wasm-pack build --target web --out-dir pkg
          cd ../../
          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public

+      - name: wasm prep - windows
+        if: matrix.os == 'windows-latest'
+        shell: pwsh
+        run: |
+          mkdir src\wasm-lib\pkg; cd src\wasm-lib
+          npx wasm-pack build --target web --out-dir pkg
+          cd ..\..\
+          cp src\wasm-lib\pkg\wasm_lib_bg.wasm public
+
      - name: Fix format
        run: yarn fmt

-      - name: Install Universal target (MacOS only)
+      - name: install apple silicon target mac
        if: matrix.os == 'macos-latest'
        run: |
          rustup target add aarch64-apple-darwin

-      - name: Prepare certificate and variables (Windows only)
-        if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
+      - name: Prepare Windows certificate and variables
+        if: matrix.os == 'windows-latest'
        run: |
          echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
          cat /d/Certificate_pkcs12.p12
@ -205,8 +182,8 @@ jobs:
          echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
        shell: bash

-      - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ matrix.os == 'windows-latest' && env.BUILD_RELEASE == 'true' }}
+      - name: Setup Windows certicate with SSM KSP
+        if: matrix.os == 'windows-latest'
        run: |
          curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
          msiexec /i smtools-windows-x64.msi /quiet /qn
@ -216,17 +193,8 @@ jobs:
          smksp_cert_sync.exe
        shell: cmd

-      - name: Build the app (debug)
+      - name: Build and sign the app for the current platform
        uses: tauri-apps/tauri-action@v0
-        if: ${{ env.BUILD_RELEASE == 'false' }}
-        with:
-          includeRelease: false
-          includeDebug: true
-          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
-
-      - name: Build the app (release) and sign
-        uses: tauri-apps/tauri-action@v0
-        if: ${{ env.BUILD_RELEASE == 'true' }}
        env:
          TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
          TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
@ -236,35 +204,17 @@ jobs:
          APPLE_ID: ${{ secrets.APPLE_ID }}
          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          TAURI_CONF_ARGS: "--config ${{ matrix.os == 'windows-latest' && 'src-tauri\\tauri.release.conf.json' || 'src-tauri/tauri.release.conf.json' }}"
        with:
-          args: "${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} ${{ env.TAURI_CONF_ARGS }}"
+          args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}

      - uses: actions/upload-artifact@v3
-        env:
-          PREFIX: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin' || 'src-tauri/target' }}
-          MODE: ${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}
        with:
-          path: "${{ env.PREFIX }}/${{ env.MODE }}/bundle/*/*"
-
-      - name: Install tauri-driver for e2e tests (linux only)
-        if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: tauri-driver
-
-      - name: Run e2e tests (linux only)
-        if: matrix.os == 'ubuntu-latest'
-        run: xvfb-run yarn test:e2e
-        env:
-          MODE: ${{ env.BUILD_RELEASE == 'true' && 'release' || 'debug' }}
-
+          path: ${{ matrix.os == 'macos-latest' && 'src-tauri/target/universal-apple-darwin/release/bundle/*/*' || 'src-tauri/target/release/bundle/*/*' }}

  publish-apps-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
-    needs: [check-format, check-types, check-typos, build-test-web, prepare-json-files, build-test-apps]
+    needs: [build-test-web, prepare-json-files, build-apps]
    env:
      VERSION_NO_V: ${{ needs.prepare-json-files.outputs.version }}
      VERSION: ${{ github.event_name == 'release' && format('v{0}', needs.prepare-json-files.outputs.version) || needs.prepare-json-files.outputs.version }}
--- a/README.md
+++ b/README.md
@ -48,7 +48,7 @@ We recommend downloading the latest application binary from [our Releases page](

 ## Running a development build

-First, [install Rust via `rustup`](https://www.rust-lang.org/tools/install). This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. We always use the latest stable version of Rust, so you may need to run `rustup update stable`. Then, run:
+First, [install Rust via `rustup`](https://www.rust-lang.org/tools/install). This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. Then, run:

 ```
 yarn install
@ -104,7 +104,7 @@ To spin up up tauri dev, `yarn install` and `yarn build:wasm-dev` need to have b
 yarn tauri dev
 ```

-Will spin up the web app before opening up the tauri dev desktop app. Note that it's probably a good idea to close the browser tab that gets opened since at the time of writing they can conflict.
+Will spin up the web app before opening up the tauri dev desktop app. Note that it's probably a good idea to close the browser tab that gets opened since at the time of writting they can conflict.

 The dev instance automatically opens up the browser devtools which can be disabled by [commenting it out](https://github.com/KittyCAD/modeling-app/blob/main/src-tauri/src/main.rs#L92.)

--- a/docs/kcl/std.json
+++ b/docs/kcl/std.json
@ -3812,7 +3812,7 @@
    "args": [
      {
        "name": "data",
-        "type": "AngledLineThatIntersectsData",
+        "type": "AngeledLineThatIntersectsData",
        "schema": {
          "description": "Data for drawing an angled line that intersects with a given line.",
          "type": "object",
--- a/docs/kcl/std.md
+++ b/docs/kcl/std.md
@ -763,12 +763,12 @@ Draw an angled line that intersects with a given line.


 ```
-angledLineThatIntersects(data: AngledLineThatIntersectsData, sketch_group: SketchGroup) -> SketchGroup
+angledLineThatIntersects(data: AngeledLineThatIntersectsData, sketch_group: SketchGroup) -> SketchGroup
 ```

 #### Arguments

-* `data`: `AngledLineThatIntersectsData` - Data for drawing an angled line that intersects with a given line.
+* `data`: `AngeledLineThatIntersectsData` - Data for drawing an angled line that intersects with a given line.
 ```
 {
 	// The angle of the line.
--- a/e2e/tauri/specs/signin.e2e.js
+++ b/e2e/tauri/specs/signin.e2e.js
@ -1,11 +0,0 @@
-describe('Modeling App', () => {
-  it('open the sign in page', async () => {
-    const button = await $('#signin')
-    expect(button).toHaveText('Sign in')
-    
-    // Workaround for .click(), see https://github.com/tauri-apps/tauri/issues/6541
-    await button.waitForClickable()
-    await browser.execute('arguments[0].click();', button)
-    // TODO: handle auth
-  })
-})
--- a/package.json
+++ b/package.json
@ -1,36 +1,36 @@
 {
  "name": "untitled-app",
-  "version": "0.12.0",
+  "version": "0.10.0",
  "private": true,
  "dependencies": {
-    "@codemirror/autocomplete": "^6.10.2",
+    "@codemirror/autocomplete": "^6.9.0",
    "@fortawesome/fontawesome-svg-core": "^6.4.2",
    "@fortawesome/free-brands-svg-icons": "^6.4.2",
    "@fortawesome/free-solid-svg-icons": "^6.4.2",
    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@headlessui/react": "^1.7.17",
+    "@headlessui/react": "^1.7.13",
    "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "^0.0.45",
+    "@kittycad/lib": "^0.0.43",
    "@lezer/javascript": "^1.4.7",
    "@open-rpc/client-js": "^1.8.1",
    "@react-hook/resize-observer": "^1.2.6",
    "@replit/codemirror-interact": "^6.3.0",
-    "@sentry/react": "^7.77.0",
-    "@tauri-apps/api": "^1.5.1",
+    "@sentry/react": "^7.65.0",
+    "@tauri-apps/api": "^1.5.0",
    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^14.0.0",
-    "@testing-library/user-event": "^14.5.1",
+    "@testing-library/react": "^13.0.0",
+    "@testing-library/user-event": "^13.2.1",
    "@ts-stack/markdown": "^1.5.0",
    "@types/node": "^16.7.13",
    "@types/react": "^18.0.0",
    "@types/react-dom": "^18.0.0",
-    "@uiw/react-codemirror": "^4.21.20",
+    "@uiw/react-codemirror": "^4.21.13",
    "@xstate/inspect": "^0.8.0",
    "@xstate/react": "^3.2.2",
-    "crypto-js": "^4.2.0",
+    "crypto-js": "^4.1.1",
    "debounce-promise": "^3.1.2",
    "formik": "^2.4.3",
-    "fuse.js": "^7.0.0",
+    "fuse.js": "^6.6.2",
    "http-server": "^14.1.1",
    "json-rpc-2.0": "^1.6.0",
    "re-resizable": "^6.9.11",
@ -43,20 +43,20 @@
    "react-modal-promise": "^1.0.2",
    "react-router-dom": "^6.14.2",
    "sketch-helpers": "^0.0.4",
-    "swr": "^2.2.2",
+    "swr": "^2.0.4",
    "tauri-plugin-fs-extra-api": "https://github.com/tauri-apps/tauri-plugin-fs-extra#v1",
    "toml": "^3.0.0",
    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2",
-    "uuid": "^9.0.1",
+    "typescript": "^4.4.2",
+    "uuid": "^9.0.0",
    "vitest": "^0.34.6",
    "vscode-jsonrpc": "^8.1.0",
-    "vscode-languageserver-protocol": "^3.17.5",
+    "vscode-languageserver-protocol": "^3.17.3",
    "wasm-pack": "^0.12.1",
-    "web-vitals": "^3.5.0",
+    "web-vitals": "^2.1.0",
    "ws": "^8.13.0",
    "xstate": "^4.38.2",
-    "zustand": "^4.4.5"
+    "zustand": "^4.1.4"
  },
  "scripts": {
    "start": "vite",
@ -69,7 +69,6 @@
    "test:nowatch": "vitest run --mode development",
    "test:rust": "(cd src/wasm-lib && cargo test --all && cargo clippy --all --tests --benches)",
    "test:cov": "vitest run --coverage --mode development",
-    "test:e2e": "wdio run wdio.conf.js",
    "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
    "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
    "fmt": "prettier --write ./src",
@ -102,34 +101,30 @@
  },
  "devDependencies": {
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-env": "^7.23.3",
-    "@tauri-apps/cli": "^1.5.6",
+    "@babel/preset-env": "^7.22.9",
+    "@tauri-apps/cli": "^1.5.0",
    "@types/crypto-js": "^4.1.1",
-    "@types/debounce-promise": "^3.1.8",
+    "@types/debounce-promise": "^3.1.6",
    "@types/isomorphic-fetch": "^0.0.36",
    "@types/react-modal": "^3.16.0",
-    "@types/uuid": "^9.0.4",
+    "@types/uuid": "^9.0.1",
    "@types/wicg-file-system-access": "^2020.9.6",
    "@types/ws": "^8.5.5",
-    "@vitejs/plugin-react": "^4.1.1",
-    "@vitest/coverage-istanbul": "^0.34.6",
+    "@vitejs/plugin-react": "^4.0.3",
+    "@vitest/coverage-istanbul": "^0.34.1",
    "autoprefixer": "^10.4.13",
-    "eslint": "^8.53.0",
+    "eslint": "^8.44.0",
    "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-css-modules": "^2.12.0",
+    "eslint-plugin-css-modules": "^2.11.0",
    "happy-dom": "^10.8.0",
    "husky": "^8.0.3",
    "postcss": "^8.4.31",
    "prettier": "^2.8.0",
    "setimmediate": "^1.0.5",
-    "tailwindcss": "^3.3.5",
-    "vite": "^4.5.0",
+    "tailwindcss": "^3.2.4",
+    "vite": "^4.4.3",
    "vite-plugin-eslint": "^1.8.1",
-    "vite-tsconfig-paths": "^4.2.1",
-    "yarn": "^1.22.19",
-    "@wdio/cli": "^7.7.3",
-    "@wdio/local-runner": "^7.7.3",
-    "@wdio/mocha-framework": "^7.7.3",
-    "@wdio/spec-reporter": "^7.7.3"
+    "vite-tsconfig-paths": "^4.2.0",
+    "yarn": "^1.22.19"
  }
 }
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@ -122,12 +122,6 @@ dependencies = [
 "system-deps 6.1.0",
 ]

-[[package]]
-name = "atomic"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@ -1573,7 +1567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
 "hermit-abi 0.3.1",
- "rustix 0.38.21",
+ "rustix 0.38.13",
 "windows-sys 0.48.0",
 ]

@ -1664,9 +1658,9 @@ dependencies = [

 [[package]]
 name = "kittycad"
-version = "0.2.42"
+version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aa554d86b6dbbd976a659c912ae25ce817b4378eb12a5684907e263410f0a7b"
+checksum = "d341a81a4dfef43460d395c87d86c17e24affb96db0e7f4a35e8688f0e092344"
 dependencies = [
 "anyhow",
 "async-trait",
@ -1732,9 +1726,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"

 [[package]]
 name = "libm"
@ -1765,9 +1759,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"

 [[package]]
 name = "lock_api"
@ -1940,9 +1934,9 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
@ -2839,9 +2833,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

 [[package]]
 name = "reqwest"
-version = "0.11.22"
+version = "0.11.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
 dependencies = [
 "base64 0.21.2",
 "bytes",
@ -2868,7 +2862,6 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_urlencoded",
- "system-configuration",
 "tokio",
 "tokio-native-tls",
 "tokio-rustls",
@ -3018,9 +3011,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.37.27"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
 "bitflags 1.3.2",
 "errno",
@ -3032,14 +3025,14 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.21"
+version = "0.38.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
+checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
 dependencies = [
 "bitflags 2.4.0",
 "errno",
 "libc",
- "linux-raw-sys 0.4.10",
+ "linux-raw-sys 0.4.7",
 "windows-sys 0.48.0",
 ]

@ -3112,9 +3105,9 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "0.8.16"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
+checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c"
 dependencies = [
 "bigdecimal",
 "bytes",
@ -3129,9 +3122,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "0.8.16"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
+checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3215,9 +3208,9 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
 "serde_derive",
 ]
@ -3233,9 +3226,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
 "proc-macro2",
 "quote",
@ -3255,9 +3248,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
 "itoa 1.0.6",
 "ryu",
@ -3438,9 +3431,9 @@ dependencies = [

 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
 "libc",
 "windows-sys 0.48.0",
@ -3607,27 +3600,6 @@ dependencies = [
 "windows-sys 0.45.0",
 ]

-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "system-deps"
 version = "5.0.0"
@ -3856,7 +3828,7 @@ dependencies = [
 [[package]]
 name = "tauri-plugin-fs-extra"
 version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#20ef22fc3ab76cab770c2c0dac0cc75dfc982c22"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#9b20f28d747f6ec3ba5a80bfcd5edc1d573b4c90"
 dependencies = [
 "log",
 "serde",
@ -3955,7 +3927,7 @@ dependencies = [
 "cfg-if",
 "fastrand",
 "redox_syscall 0.3.5",
- "rustix 0.37.27",
+ "rustix 0.37.19",
 "windows-sys 0.45.0",
 ]

@ -4035,9 +4007,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
 "backtrace",
 "bytes",
@ -4045,7 +4017,7 @@ dependencies = [
 "mio",
 "num_cpus",
 "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.4",
 "windows-sys 0.48.0",
 ]

@ -4320,7 +4292,6 @@ version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
 dependencies = [
- "atomic",
 "getrandom 0.2.9",
 "serde",
 ]
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@ -4,7 +4,7 @@ version = "0.1.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""
-repository = "https://github.com/KittyCAD/modeling-app"
+repository = ""
 default-run = "app"
 edition = "2021"
 rust-version = "1.60"
@ -16,13 +16,13 @@ tauri-build = { version = "1.5.0", features = [] }

 [dependencies]
 anyhow = "1"
-kittycad = "0.2.42"
+kittycad = "0.2.33"
 oauth2 = "4.4.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri = { version = "1.5.2", features = [ "os-all", "dialog-all", "fs-all", "http-request", "path-all", "shell-open", "shell-open-api", "updater", "devtools"] }
 tauri-plugin-fs-extra = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tokio = { version = "1.34.0", features = ["time"] }
+tokio = { version = "1.33.0", features = ["time"] }
 toml = "0.8.2"

 [features]
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@ -68,7 +68,7 @@ async fn login(app: tauri::AppHandle, host: &str) -> Result<String, InvokeError>
    };

    // Open the system browser with the auth_uri.
-    // We do this in the browser and not a separate window because we want 1password and
+    // We do this in the browser and not a seperate window because we want 1password and
    // other crap to work well.
    tauri::api::shell::open(&app.shell_scope(), auth_uri.secret(), None)
        .map_err(|e| InvokeError::from_anyhow(e.into()))?;
@ -129,10 +129,10 @@ async fn get_user(

 fn main() {
    tauri::Builder::default()
-        .setup(|_app| {
+        .setup(|app| {
            #[cfg(debug_assertions)] // only include this code on debug builds
            {
-                let window = _app.get_window("main").unwrap();
+                let window = app.get_window("main").unwrap();
                // comment out the below if you don't devtools to open everytime.
                // it's useful because otherwise devtools shuts everytime rust code changes.
                window.open_devtools();
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@ -8,7 +8,7 @@
  },
  "package": {
    "productName": "kittycad-modeling",
-    "version": "0.12.0"
+    "version": "0.10.0"
  },
  "tauri": {
    "allowlist": {
@ -72,13 +72,23 @@
      },
      "resources": [],
      "shortDescription": "",
-      "targets": "all"
+      "targets": "all",
+      "windows": {
+        "certificateThumbprint": "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D",
+        "digestAlgorithm": "sha256",
+        "timestampUrl": "http://timestamp.digicert.com"
+      }
    },
    "security": {
      "csp": null
    },
    "updater": {
-      "active": false
+      "active": true,
+      "endpoints": [
+        "https://dl.kittycad.io/releases/modeling-app/last_update.json"
+      ],
+      "dialog": true,
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUzNzA4MjBEQjFBRTY4NzYKUldSMmFLNnhEWUp3NCtsT21Jd05wQktOaGVkOVp6MUFma0hNTDRDSnI2RkJJTEZOWG1ncFhqcU8K"
    },
    "windows": [
      {
--- a/src-tauri/tauri.macos.conf.json
+++ b/src-tauri/tauri.macos.conf.json
@ -1,6 +1,7 @@
+
 {
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "package": {
    "productName": "KittyCAD Modeling"
  }
-}
+}
--- a/src-tauri/tauri.release.conf.json
+++ b/src-tauri/tauri.release.conf.json
@ -1,21 +0,0 @@
-{
-  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
-  "tauri": {
-    "updater": {
-      "active": true,
-      "endpoints": [
-        "https://dl.kittycad.io/releases/modeling-app/last_update.json"
-      ],
-      "dialog": true,
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUzNzA4MjBEQjFBRTY4NzYKUldSMmFLNnhEWUp3NCtsT21Jd05wQktOaGVkOVp6MUFma0hNTDRDSnI2RkJJTEZOWG1ncFhqcU8K"
-    },
-    "bundle": {
-      "identifier": "io.kittycad.modeling-app",
-      "windows": {
-        "certificateThumbprint": "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D",
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "http://timestamp.digicert.com"
-      }
-    }
-  }
-}
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@ -1,6 +1,7 @@
+
 {
  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
  "package": {
    "productName": "KittyCAD Modeling"
  }
-}
+}
--- a/src/App.tsx
+++ b/src/App.tsx
@ -1,4 +1,4 @@
-import { useCallback, MouseEventHandler } from 'react'
+import { useEffect, useCallback, MouseEventHandler } from 'react'
 import { DebugPanel } from './components/DebugPanel'
 import { v4 as uuidv4 } from 'uuid'
 import { PaneType, useStore } from './useStore'
@ -19,6 +19,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { getNormalisedCoordinates } from './lib/utils'
+import { isTauri } from './lib/isTauri'
 import { useLoaderData } from 'react-router-dom'
 import { IndexLoaderData } from './Router'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
@ -30,10 +31,11 @@ import { TextEditor } from 'components/TextEditor'
 import { Themes, getSystemTheme } from 'lib/theme'
 import { useEngineConnectionSubscriptions } from 'hooks/useEngineConnectionSubscriptions'
 import { engineCommandManager } from './lang/std/engineConnection'
+import { kclManager } from 'lang/KclSinglton'
 import { useModelingContext } from 'hooks/useModelingContext'

 export function App() {
-  const { project, file } = useLoaderData() as IndexLoaderData
+  const { code: loadedCode, project, file } = useLoaderData() as IndexLoaderData

  useHotKeyListener()
  const {
@ -80,6 +82,26 @@ export function App() {
    ? 'opacity-40'
    : ''

+  // Use file code loaded from disk
+  // on mount, and overwrite any locally-stored code
+  useEffect(() => {
+    if (isTauri() && loadedCode !== null) {
+      if (kclManager.engineCommandManager.engineConnection?.isReady()) {
+        // If the engine is ready, promptly execute the loaded code
+        kclManager.setCodeAndExecute(loadedCode)
+      } else {
+        // Otherwise, just set the code and wait for the connection to complete
+        kclManager.setCode(loadedCode)
+      }
+    }
+    return () => {
+      // Clear code on unmount if in desktop app
+      if (isTauri()) {
+        kclManager.setCode('')
+      }
+    }
+  }, [loadedCode])
+
  useEngineConnectionSubscriptions()

  const debounceSocketSend = throttle<EngineCommand>((message) => {
@ -226,7 +248,7 @@ export function App() {
      <Stream className="absolute inset-0 z-0" />
      {showDebugPanel && (
        <DebugPanel
-          title="Debug (AST Explorer)"
+          title="Debug"
          className={
            'transition-opacity transition-duration-75 ' +
            paneOpacity +
--- a/src/Router.tsx
+++ b/src/Router.tsx
@ -31,7 +31,6 @@ import {
 } from './lib/tauriFS'
 import { metadata, type Metadata } from 'tauri-plugin-fs-extra-api'
 import DownloadAppBanner from './components/DownloadAppBanner'
-import { WasmErrBanner } from './components/WasmErrBanner'
 import { GlobalStateProvider } from './components/GlobalStateProvider'
 import {
  SETTINGS_PERSIST_KEY,
@ -42,9 +41,8 @@ import CommandBarProvider from 'components/CommandBar'
 import { TEST, VITE_KC_SENTRY_DSN } from './env'
 import * as Sentry from '@sentry/react'
 import ModelingMachineProvider from 'components/ModelingMachineProvider'
-import { KclContextProvider, kclManager } from 'lang/KclSinglton'
+import { KclContextProvider } from 'lang/KclSinglton'
 import FileMachineProvider from 'components/FileMachineProvider'
-import { sep } from '@tauri-apps/api/path'

 if (VITE_KC_SENTRY_DSN && !TEST) {
  Sentry.init({
@ -146,13 +144,12 @@ const router = createBrowserRouter(
      path: paths.FILE + '/:id',
      element: (
        <Auth>
+          <Outlet />
          <FileMachineProvider>
            <KclContextProvider>
              <ModelingMachineProvider>
-                <Outlet />
                <App />
              </ModelingMachineProvider>
-              <WasmErrBanner />
            </KclContextProvider>
          </FileMachineProvider>
          {!isTauri() && import.meta.env.PROD && <DownloadAppBanner />}
@ -188,26 +185,25 @@ const router = createBrowserRouter(

        if (params.id && params.id !== BROWSER_FILE_NAME) {
          const decodedId = decodeURIComponent(params.id)
-          const projectAndFile = decodedId.replace(defaultDir + sep, '')
-          const firstSlashIndex = projectAndFile.indexOf(sep)
+          const projectAndFile = decodedId.replace(defaultDir + '/', '')
+          const firstSlashIndex = projectAndFile.indexOf('/')
          const projectName = projectAndFile.slice(0, firstSlashIndex)
-          const projectPath = defaultDir + sep + projectName
+          const projectPath = defaultDir + '/' + projectName
          const currentFileName = projectAndFile.slice(firstSlashIndex + 1)

          if (firstSlashIndex === -1 || !currentFileName)
            return redirect(
              `${paths.FILE}/${encodeURIComponent(
-                `${params.id}${sep}${PROJECT_ENTRYPOINT}`
+                `${params.id}/${PROJECT_ENTRYPOINT}`
              )}`
            )

          // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
          const code = await readTextFile(decodedId)
          const entrypointMetadata = await metadata(
-            projectPath + sep + PROJECT_ENTRYPOINT
+            projectPath + '/' + PROJECT_ENTRYPOINT
          )
          const children = await readDir(projectPath, { recursive: true })
-          kclManager.setCodeAndExecute(code, false)

          return {
            code,
@ -272,9 +268,9 @@ const router = createBrowserRouter(
          isProjectDirectory
        )
        const projects = await Promise.all(
-          projectsNoMeta.map(async (p: FileEntry) => ({
+          projectsNoMeta.map(async (p) => ({
            entrypointMetadata: await metadata(
-              p.path + sep + PROJECT_ENTRYPOINT
+              p.path + '/' + PROJECT_ENTRYPOINT
            ),
            ...p,
          }))
--- a/src/Toolbar.tsx
+++ b/src/Toolbar.tsx
@ -1,3 +1,4 @@
+import { ToolTip } from './useStore'
 import { Fragment, WheelEvent, useRef, useMemo } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faSearch, faX } from '@fortawesome/free-solid-svg-icons'
@ -14,6 +15,23 @@ export const sketchButtonClassnames = {
  icon: 'text-fern-20 h-auto group-hover:text-fern-10 hover:text-fern-10 dark:text-chalkboard-100 dark:group-hover:text-chalkboard-100 dark:hover:text-chalkboard-100 group-disabled:bg-chalkboard-60 hover:group-disabled:text-inherit',
 }

+const sketchFnLabels: Record<ToolTip | 'sketch_line' | 'move', string> = {
+  sketch_line: 'Line',
+  line: 'Line',
+  move: 'Move',
+  angledLine: 'Angled Line',
+  angledLineThatIntersects: 'Angled Line That Intersects',
+  angledLineOfXLength: 'Angled Line Of X Length',
+  angledLineOfYLength: 'Angled Line Of Y Length',
+  angledLineToX: 'Angled Line To X',
+  angledLineToY: 'Angled Line To Y',
+  lineTo: 'Line to Point',
+  xLine: 'Horizontal Line',
+  yLine: 'Vertical Line',
+  xLineTo: 'Horizontal Line to Point',
+  yLineTo: 'Vertical Line to Point',
+}
+
 export const Toolbar = () => {
  const { state, send, context } = useModelingContext()
  const toolbarButtonsRef = useRef<HTMLSpanElement>(null)
--- a/src/components/AppHeader.tsx
+++ b/src/components/AppHeader.tsx
@ -32,11 +32,13 @@ export const AppHeader = ({
        className
      }
    >
-      <ProjectSidebarMenu
-        renderAsLink={!enableMenu}
-        project={project?.project}
-        file={project?.file}
-      />
+      {project && (
+        <ProjectSidebarMenu
+          renderAsLink={!enableMenu}
+          project={project.project}
+          file={project.file}
+        />
+      )}
      {/* Toolbar if the context deems it */}
      {showToolbar && (
        <div className="max-w-lg md:max-w-xl lg:max-w-2xl xl:max-w-4xl 2xl:max-w-5xl">
@ -45,7 +47,7 @@ export const AppHeader = ({
      )}
      {/* If there are children, show them, otherwise show User menu */}
      {children || (
-        <div className="flex items-center gap-1 ml-auto">
+        <div className="ml-auto flex items-center gap-1">
          <NetworkHealthIndicator />
          <UserSidebarMenu user={user} />
        </div>
--- a/src/components/AstExplorer.tsx
+++ b/src/components/AstExplorer.tsx
@ -184,7 +184,6 @@ function DisplayObj({
                  </li>
                )
              }
-              return null
            })}
          </ul>
        </span>
--- a/src/components/AvailableVarsHelpers.tsx
+++ b/src/components/AvailableVarsHelpers.tsx
@ -1,5 +1,5 @@
 import { useEffect, useState, useRef } from 'react'
-import { parse, BinaryPart, Value } from '../lang/wasm'
+import { parse, BinaryPart, Value, executor } from '../lang/wasm'
 import {
  createIdentifier,
  createLiteral,
@ -10,7 +10,6 @@ import { findAllPreviousVariables, PrevVariable } from '../lang/queryAst'
 import { engineCommandManager } from '../lang/std/engineConnection'
 import { kclManager, useKclContext } from 'lang/KclSinglton'
 import { useModelingContext } from 'hooks/useModelingContext'
-import { executeAst } from 'useStore'

 export const AvailableVars = ({
  onVarClick,
@ -131,29 +130,27 @@ export function useCalc({
    if (!programMemory || !selectionRange) return
    const varInfo = findAllPreviousVariables(
      kclManager.ast,
-      kclManager.programMemory,
+      programMemory,
      selectionRange
    )
    setAvailableVarInfo(varInfo)
-  }, [kclManager.ast, kclManager.programMemory, selectionRange])
+  }, [kclManager.ast, programMemory, selectionRange])

  useEffect(() => {
    try {
-      const code = `const __result__ = ${value}`
+      const code = `const __result__ = ${value}\nshow(__result__)`
      const ast = parse(code)
      const _programMem: any = { root: {}, return: null }
      availableVarInfo.variables.forEach(({ key, value }) => {
        _programMem.root[key] = { type: 'userVal', value, __meta: [] }
      })
-      executeAst({
+
+      executor(
        ast,
+        _programMem,
        engineCommandManager,
-        defaultPlanes: kclManager.defaultPlanes,
-        useFakeExecutor: true,
-        programMemoryOverride: JSON.parse(
-          JSON.stringify(kclManager.programMemory)
-        ),
-      }).then(({ programMemory }) => {
+        kclManager.defaultPlanes
+      ).then((programMemory) => {
        const resultDeclaration = ast.body.find(
          (a) =>
            a.type === 'VariableDeclaration' &&
@ -170,7 +167,7 @@ export function useCalc({
      setCalcResult('NAN')
      setValueNode(null)
    }
-  }, [value, availableVarInfo])
+  }, [value])

  return {
    valueNode,
@ -215,10 +212,7 @@ export const CreateNewVariable = ({
 }) => {
  return (
    <>
-      <label
-        htmlFor="create-new-variable"
-        className="block mt-3 font-mono text-gray-900"
-      >
+      <label htmlFor="create-new-variable" className="block mt-3 font-mono">
        Create new variable
      </label>
      <div className="mt-1 flex gap-2 items-center">
@ -229,7 +223,6 @@ export const CreateNewVariable = ({
            onChange={(e) => {
              setShouldCreateVariable(e.target.checked)
            }}
-            className="bg-white text-gray-900"
          />
        )}
        <input
--- a/src/components/DebugPanel.tsx
+++ b/src/components/DebugPanel.tsx
@ -1,7 +1,29 @@
 import { CollapsiblePanel, CollapsiblePanelProps } from './CollapsiblePanel'
+import { v4 as uuidv4 } from 'uuid'
+import { EngineCommand } from '../lang/std/engineConnection'
+import { useState } from 'react'
+import { ActionButton } from '../components/ActionButton'
+import { faCheck } from '@fortawesome/free-solid-svg-icons'
+import { isReducedMotion } from 'lang/util'
 import { AstExplorer } from './AstExplorer'
+import { engineCommandManager } from '../lang/std/engineConnection'
+
+type SketchModeCmd = Extract<
+  Extract<EngineCommand, { type: 'modeling_cmd_req' }>['cmd'],
+  { type: 'default_camera_enable_sketch_mode' }
+>

 export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
+  const [sketchModeCmd, setSketchModeCmd] = useState<SketchModeCmd>({
+    type: 'default_camera_enable_sketch_mode',
+    origin: { x: 0, y: 0, z: 0 },
+    x_axis: { x: 1, y: 0, z: 0 },
+    y_axis: { x: 0, y: 1, z: 0 },
+    distance_to_plane: 100,
+    ortho: true,
+    animated: !isReducedMotion(),
+  })
+  if (!sketchModeCmd) return null
  return (
    <CollapsiblePanel
      {...props}
@ -12,6 +34,67 @@ export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
      style={{ maxHeight: 'calc(100% - 3rem - 1.25rem - 1.25rem)' }}
    >
      <section className="p-4 flex flex-col gap-4">
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="origin"
+          data={sketchModeCmd}
+        />
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="x_axis"
+          data={sketchModeCmd}
+        />
+        <Xyz
+          onChange={setSketchModeCmd}
+          pointKey="y_axis"
+          data={sketchModeCmd}
+        />
+        <div className="flex">
+          <div className="pr-4">distance_to_plane</div>
+          <input
+            className="w-16 dark:bg-chalkboard-90"
+            type="number"
+            value={sketchModeCmd.distance_to_plane}
+            onChange={({ target }) => {
+              setSketchModeCmd({
+                ...sketchModeCmd,
+                distance_to_plane: Number(target.value),
+              })
+            }}
+          />
+          <div className="pr-4">ortho</div>
+          <input
+            className="w-16"
+            type="checkbox"
+            checked={sketchModeCmd.ortho}
+            onChange={(a) =>
+              setSketchModeCmd({
+                ...sketchModeCmd,
+                ortho: a.target.checked,
+              })
+            }
+          />
+        </div>
+        <ActionButton
+          Element="button"
+          onClick={() => {
+            engineCommandManager.sendSceneCommand({
+              type: 'modeling_cmd_req',
+              cmd: sketchModeCmd,
+              cmd_id: uuidv4(),
+            })
+          }}
+          className="hover:border-succeed-50"
+          icon={{
+            icon: faCheck,
+            bgClassName:
+              'bg-succeed-80 group-hover:bg-succeed-70 hover:bg-succeed-70',
+            iconClassName:
+              'text-succeed-20 group-hover:text-succeed-10 hover:text-succeed-10',
+          }}
+        >
+          Send sketch mode command
+        </ActionButton>
        <div style={{ height: '400px' }} className="overflow-y-auto">
          <AstExplorer />
        </div>
@ -19,3 +102,41 @@ export const DebugPanel = ({ className, ...props }: CollapsiblePanelProps) => {
    </CollapsiblePanel>
  )
 }
+
+const Xyz = ({
+  pointKey,
+  data,
+  onChange,
+}: {
+  pointKey: 'origin' | 'y_axis' | 'x_axis'
+  data: SketchModeCmd
+  onChange: (a: SketchModeCmd) => void
+}) => {
+  if (!data) return null
+  return (
+    <div className="flex">
+      <div className="pr-4">{pointKey}</div>
+      {Object.entries(data[pointKey]).map(([axis, val]) => {
+        return (
+          <div key={axis} className="flex">
+            <div className="w-4">{axis}</div>
+            <input
+              className="w-16 dark:bg-chalkboard-90"
+              type="number"
+              value={val}
+              onChange={({ target }) => {
+                onChange({
+                  ...data,
+                  [pointKey]: {
+                    ...data[pointKey],
+                    [axis]: Number(target.value),
+                  },
+                })
+              }}
+            />
+          </div>
+        )
+      })}
+    </div>
+  )
+}
--- a/src/components/FileMachineProvider.tsx
+++ b/src/components/FileMachineProvider.tsx
@ -22,7 +22,6 @@ import {
 } from '@tauri-apps/api/fs'
 import { FILE_EXT, readProject } from 'lib/tauriFS'
 import { isTauri } from 'lib/isTauri'
-import { sep } from '@tauri-apps/api/path'

 type MachineContext<T extends AnyStateMachine> = {
  state: StateFrom<T>
@ -57,7 +56,7 @@ export const FileMachineProvider = ({
          setCommandBarOpen(false)
          navigate(
            `${paths.FILE}/${encodeURIComponent(
-              context.selectedDirectory + sep + event.data.name
+              context.selectedDirectory + '/' + event.data.name
            )}`
          )
        }
@ -83,11 +82,11 @@ export const FileMachineProvider = ({
        let name = event.data.name.trim() || DEFAULT_FILE_NAME

        if (event.data.makeDir) {
-          await createDir(context.selectedDirectory.path + sep + name)
+          await createDir(context.selectedDirectory.path + '/' + name)
        } else {
          await writeFile(
            context.selectedDirectory.path +
-              sep +
+              '/' +
              name +
              (name.endsWith(FILE_EXT) ? '' : FILE_EXT),
            ''
@ -104,9 +103,9 @@ export const FileMachineProvider = ({
        let name = newName ? newName : DEFAULT_FILE_NAME

        await renameFile(
-          context.selectedDirectory.path + sep + oldName,
+          context.selectedDirectory.path + '/' + oldName,
          context.selectedDirectory.path +
-            sep +
+            '/' +
            name +
            (name.endsWith(FILE_EXT) || isDir ? '' : FILE_EXT)
        )
--- a/src/components/FileTree.tsx
+++ b/src/components/FileTree.tsx
@ -2,13 +2,14 @@ import { IndexLoaderData, paths } from 'Router'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
 import { FileEntry } from '@tauri-apps/api/fs'
-import { Dispatch, useRef, useState } from 'react'
+import { Dispatch, useEffect, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { Dialog, Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faChevronRight, faTrashAlt } from '@fortawesome/free-solid-svg-icons'
 import { useFileContext } from 'hooks/useFileContext'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { kclManager } from 'lang/KclSinglton'
 import styles from './FileTree.module.css'
 import { sortProject } from 'lib/tauriFS'

@ -162,6 +163,7 @@ const FileTreeItem = ({

  function openFile() {
    if (fileOrDir.children !== undefined) return // Don't open directories
+    kclManager.setCode('')
    navigate(`${paths.FILE}/${encodeURIComponent(fileOrDir.path)}`)
    closePanel()
  }
--- a/src/components/GlobalStateProvider.tsx
+++ b/src/components/GlobalStateProvider.tsx
@ -24,7 +24,9 @@ import {
  StateFrom,
 } from 'xstate'
 import { useCommandsContext } from 'hooks/useCommandsContext'
+import { invoke } from '@tauri-apps/api'
 import { isTauri } from 'lib/isTauri'
+import { VITE_KC_API_BASE_URL } from 'env'

 type MachineContext<T extends AnyStateMachine> = {
  state: StateFrom<T>
--- a/src/components/ModelingMachineProvider.tsx
+++ b/src/components/ModelingMachineProvider.tsx
@ -20,6 +20,7 @@ import {
  recast,
  parse,
  Program,
+  VariableDeclarator,
  PipeExpression,
  CallExpression,
 } from 'lang/wasm'
@ -147,7 +148,7 @@ export const ModelingMachineProvider = ({
            engineCommandManager.artifactMap[sketchEnginePathId] = {
              type: 'result',
              range: [startProfileAtCallExp.start, startProfileAtCallExp.end],
-              commandType: 'start_path',
+              commandType: 'extend_path',
              data: null,
              raw: {} as any,
            }
@ -171,38 +172,27 @@ export const ModelingMachineProvider = ({
          }
        }
      ),
-      'AST add line segment': async (
+      'AST add line segment': (
        { sketchPathToNode, sketchEnginePathId },
        { data: { coords, segmentId } }
      ) => {
        if (!sketchPathToNode) return
        const lastCoord = coords[coords.length - 1]

-        const pathInfo = await engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd_id: uuidv4(),
-          cmd: {
-            type: 'path_get_info',
-            path_id: sketchEnginePathId,
-          },
-        })
-        const firstSegment = pathInfo?.data?.data?.segments.find(
-          (seg: any) => seg.command === 'line_to'
+        const { node: varDec } = getNodeFromPath<VariableDeclarator>(
+          kclManager.ast,
+          sketchPathToNode,
+          'VariableDeclarator'
        )
-        const firstSegCoords = await engineCommandManager.sendSceneCommand({
-          type: 'modeling_cmd_req',
-          cmd_id: uuidv4(),
-          cmd: {
-            type: 'curve_get_control_points',
-            curve_id: firstSegment.command_id,
-          },
-        })
-        const startPathCoord = firstSegCoords?.data?.data?.control_points[0]
+        const variableName = varDec.id.name
+        const sketchGroup = kclManager.programMemory.root[variableName]
+        if (!sketchGroup || sketchGroup.type !== 'SketchGroup') return
+        const initialCoords = sketchGroup.value[0].from

-        const isClose = compareVec2Epsilon(
-          [startPathCoord.x, startPathCoord.y],
-          [lastCoord.x, lastCoord.y]
-        )
+        const isClose = compareVec2Epsilon(initialCoords, [
+          lastCoord.x,
+          lastCoord.y,
+        ])

        let _modifiedAst: Program
        if (!isClose) {
@ -210,7 +200,6 @@ export const ModelingMachineProvider = ({
            node: kclManager.ast,
            programMemory: kclManager.programMemory,
            to: [lastCoord.x, lastCoord.y],
-            from: [coords[0].x, coords[0].y],
            fnName: 'line',
            pathToNode: sketchPathToNode,
          })
@ -424,12 +413,6 @@ export const ModelingMachineProvider = ({
    })
  }, [modelingSend, modelingState.nextEvents])

-  useEffect(() => {
-    kclManager.registerExecuteCallback(() => {
-      modelingSend({ type: 'Re-execute' })
-    })
-  }, [modelingSend])
-
  // useStateMachineCommands({
  //   state: settingsState,
  //   send: settingsSend,
--- a/src/components/ProjectSidebarMenu.tsx
+++ b/src/components/ProjectSidebarMenu.tsx
@ -7,7 +7,6 @@ import { Link } from 'react-router-dom'
 import { ExportButton } from './ExportButton'
 import { Fragment } from 'react'
 import { FileTree } from './FileTree'
-import { sep } from '@tauri-apps/api/path'

 const ProjectSidebarMenu = ({
  project,
@ -27,10 +26,10 @@ const ProjectSidebarMenu = ({
      <img
        src="/kitt-8bit-winking.svg"
        alt="KittyCAD App"
-        className="w-auto h-9"
+        className="h-9 w-auto"
      />
      <span
-        className="hidden text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap lg:block"
+        className="text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap hidden lg:block"
        data-testid="project-sidebar-link-name"
      >
        {project?.name ? project.name : 'KittyCAD Modeling App'}
@ -45,16 +44,16 @@ const ProjectSidebarMenu = ({
        <img
          src="/kitt-8bit-winking.svg"
          alt="KittyCAD App"
-          className="w-auto h-full"
+          className="h-full w-auto"
        />
        <div className="flex flex-col items-start py-0.5">
-          <span className="hidden text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap lg:block">
+          <span className="text-sm text-chalkboard-110 dark:text-chalkboard-20 whitespace-nowrap hidden lg:block">
            {isTauri() && file?.name
-              ? file.name.slice(file.name.lastIndexOf(sep) + 1)
+              ? file.name.slice(file.name.lastIndexOf('/') + 1)
              : 'KittyCAD Modeling App'}
          </span>
          {isTauri() && project?.name && (
-            <span className="hidden text-xs text-chalkboard-70 dark:text-chalkboard-40 whitespace-nowrap lg:block">
+            <span className="text-xs text-chalkboard-70 dark:text-chalkboard-40 whitespace-nowrap hidden lg:block">
              {project.name}
            </span>
          )}
@ -69,7 +68,7 @@ const ProjectSidebarMenu = ({
        leaveTo="opacity-0"
        as={Fragment}
      >
-        <Popover.Overlay className="fixed inset-0 z-20 bg-chalkboard-110/50" />
+        <Popover.Overlay className="fixed z-20 inset-0 bg-chalkboard-110/50" />
      </Transition>

      <Transition
@ -82,7 +81,7 @@ const ProjectSidebarMenu = ({
        as={Fragment}
      >
        <Popover.Panel
-          className="fixed inset-0 right-auto z-30 grid w-64 h-screen max-h-screen grid-cols-1 border rounded-r-lg shadow-md bg-chalkboard-10 dark:bg-chalkboard-100 border-energy-100 dark:border-energy-100/50"
+          className="fixed inset-0 right-auto z-30 w-64 h-screen max-h-screen grid grid-cols-1 bg-chalkboard-10 dark:bg-chalkboard-100 border border-energy-100 dark:border-energy-100/50 shadow-md rounded-r-lg"
          style={{ gridTemplateRows: 'auto 1fr auto' }}
        >
          {({ close }) => (
@ -91,7 +90,7 @@ const ProjectSidebarMenu = ({
                <img
                  src="/kitt-8bit-winking.svg"
                  alt="KittyCAD App"
-                  className="w-auto h-9"
+                  className="h-9 w-auto"
                />

                <div>
@ -103,7 +102,7 @@ const ProjectSidebarMenu = ({
                  </p>
                  {project?.entrypointMetadata && (
                    <p
-                      className="m-0 text-xs text-chalkboard-100 dark:text-energy-40"
+                      className="m-0 text-chalkboard-100 dark:text-energy-40 text-xs"
                      data-testid="createdAt"
                    >
                      Created{' '}
@ -121,7 +120,7 @@ const ProjectSidebarMenu = ({
              ) : (
                <div className="flex-1 overflow-hidden" />
              )}
-              <div className="flex flex-col gap-2 p-4 bg-energy-10/25 dark:bg-energy-110">
+              <div className="p-4 flex flex-col gap-2 bg-energy-10/25 dark:bg-energy-110">
                <ExportButton
                  className={{
                    button:
--- a/src/components/SetAngleLengthModal.tsx
+++ b/src/components/SetAngleLengthModal.tsx
@ -108,7 +108,7 @@ export const SetAngleLengthModal = ({
                </label>
                <div className="mt-1 flex">
                  <button
-                    className="border border-gray-300 px-2 text-gray-900"
+                    className="border border-gray-300 px-2"
                    onClick={() => setSign(-sign)}
                  >
                    {sign > 0 ? '+' : '-'}
@ -118,7 +118,7 @@ export const SetAngleLengthModal = ({
                    type="text"
                    name="val"
                    id="val"
-                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md font-mono pl-1 text-gray-900"
+                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md font-mono pl-1"
                    value={value}
                    onChange={(e) => {
                      setValue(e.target.value)
--- a/src/components/SetHorVertDistanceModal.tsx
+++ b/src/components/SetHorVertDistanceModal.tsx
@ -87,7 +87,7 @@ export const GetInfoModal = ({
              leaveFrom="opacity-100 scale-100"
              leaveTo="opacity-0 scale-95"
            >
-              <Dialog.Panel className="w-full max-w-md transform overflow-hidden rounded-2xl bg-white/90 p-6 text-left align-middle shadow-xl transition-all">
+              <Dialog.Panel className="w-full max-w-md transform overflow-hidden rounded-2xl bg-white p-6 text-left align-middle shadow-xl transition-all">
                <Dialog.Title
                  as="h3"
                  className="text-lg font-medium leading-6 text-gray-900"
@ -109,7 +109,7 @@ export const GetInfoModal = ({
                </label>
                <div className="mt-1 flex">
                  <button
-                    className="border border-gray-400 px-2 mr-1 text-gray-900"
+                    className="border border-gray-300 px-2 mr-1"
                    onClick={() => setSign(-sign)}
                  >
                    {sign > 0 ? '+' : '-'}
@ -119,7 +119,7 @@ export const GetInfoModal = ({
                    name="val"
                    id="val"
                    ref={inputRef}
-                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm text-gray-900 border-gray-300 rounded-md font-mono"
+                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md font-mono"
                    value={value}
                    onChange={(e) => {
                      setValue(e.target.value)
@ -139,7 +139,7 @@ export const GetInfoModal = ({
                    name="segName"
                    id="segName"
                    disabled={!isSegNameEditable}
-                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm text-gray-900 border-gray-300 rounded-md font-mono"
+                    className="shadow-sm focus:ring-blue-500 focus:border-blue-500 block w-full sm:text-sm border-gray-300 rounded-md font-mono"
                    value={segName}
                    onChange={(e) => {
                      setSegName(e.target.value)
--- a/src/components/Stream.tsx
+++ b/src/components/Stream.tsx
@ -14,7 +14,7 @@ import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import { CameraDragInteractionType_type } from '@kittycad/lib/dist/types/src/models'
 import { Models } from '@kittycad/lib'
 import { getNodeFromPath } from 'lang/queryAst'
-import { VariableDeclarator, recast, CallExpression } from 'lang/wasm'
+import { VariableDeclarator, recast, parse, CallExpression } from 'lang/wasm'
 import { engineCommandManager } from '../lang/std/engineConnection'
 import { useModelingContext } from 'hooks/useModelingContext'
 import { kclManager, useKclContext } from 'lang/KclSinglton'
@ -267,11 +267,11 @@ export const Stream = ({ className = '' }) => {
      }
      engineCommandManager.sendSceneCommand(command).then(async () => {
        if (!context.sketchPathToNode) return
-        getNodeFromPath<VariableDeclarator>(
+        const varDec = getNodeFromPath<VariableDeclarator>(
          kclManager.ast,
          context.sketchPathToNode,
          'VariableDeclarator'
-        )
+        ).node
        // Get the current plane string for plane we are on.
        let currentPlaneString = ''
        if (context.sketchPlaneId === kclManager.getPlaneId('xy')) {
@ -342,8 +342,7 @@ export const Stream = ({ className = '' }) => {

          // update artifact map ranges now that we have updated the ast.
          code = recast(modded.modifiedAst)
-          const astWithCurrentRanges = kclManager.safeParse(code)
-          if (!astWithCurrentRanges) return
+          const astWithCurrentRanges = parse(code)
          const updateNode = getNodeFromPath<CallExpression>(
            astWithCurrentRanges,
            modded.pathToNode
--- a/src/components/TextEditor.tsx
+++ b/src/components/TextEditor.tsx
@ -17,8 +17,17 @@ import { useStore } from 'useStore'
 import { processCodeMirrorRanges } from 'lib/selections'
 import { LanguageServerClient } from 'editor/lsp'
 import kclLanguage from 'editor/lsp/language'
-import { EditorView, lineHighlightField } from 'editor/highlightextension'
-import { roundOff } from 'lib/utils'
+import { isTauri } from 'lib/isTauri'
+import { useParams } from 'react-router-dom'
+import { writeTextFile } from '@tauri-apps/api/fs'
+import { PROJECT_ENTRYPOINT } from 'lib/tauriFS'
+import { toast } from 'react-hot-toast'
+import {
+  EditorView,
+  addLineHighlight,
+  lineHighlightField,
+} from 'editor/highlightextension'
+import { isOverlap, roundOff } from 'lib/utils'
 import { kclErrToDiagnostic } from 'lang/errors'
 import { CSSRuleObject } from 'tailwindcss/types/config'
 import { useModelingContext } from 'hooks/useModelingContext'
@ -42,6 +51,7 @@ export const TextEditor = ({
 }: {
  theme: Themes.Light | Themes.Dark
 }) => {
+  const pathParams = useParams()
  const { editorView, isLSPServerReady, setEditorView, setIsLSPServerReady } =
    useStore((s) => ({
      editorView: s.editorView,
@ -83,7 +93,7 @@ export const TextEditor = ({
  // Here we initialize the plugin which will start the client.
  // When we have multi-file support the name of the file will be a dep of
  // this use memo, as well as the directory structure, which I think is
-  // a good setup because it will restart the client but not the server :)
+  // a good setup becuase it will restart the client but not the server :)
  // We do not want to restart the server, its just wasteful.
  const kclLSP = useMemo(() => {
    let plugin = null
@ -102,8 +112,20 @@ export const TextEditor = ({
  }, [lspClient, isLSPServerReady])

  // const onChange = React.useCallback((value: string, viewUpdate: ViewUpdate) => {
-  const onChange = (newCode: string) => {
+  const onChange = (newCode: string, viewUpdate: ViewUpdate) => {
    kclManager.setCodeAndExecute(newCode)
+    if (isTauri() && pathParams.id) {
+      // Save the file to disk
+      // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
+      writeTextFile(pathParams.id, newCode).catch((err) => {
+        // TODO: add Sentry per GH issue #254 (https://github.com/KittyCAD/modeling-app/issues/254)
+        console.error('error saving file', err)
+        toast.error('Error saving file, please check file permissions')
+      })
+    }
+    if (editorView) {
+      editorView?.dispatch({ effects: addLineHighlight.of([0, 0]) })
+    }
  } //, []);
  const onUpdate = (viewUpdate: ViewUpdate) => {
    if (!editorView) {
--- a/src/components/Toolbar/EqualLength.tsx
+++ b/src/components/Toolbar/EqualLength.tsx
@ -69,7 +69,7 @@ export function applyConstraintEqualLength({
  modifiedAst: Program
  pathToNodeMap: PathToNodeMap
 } {
-  const { transforms } = setEqualLengthInfo({ selectionRanges })
+  const { enabled, transforms } = setEqualLengthInfo({ selectionRanges })
  const { modifiedAst, pathToNodeMap } = transformSecondarySketchLinesTagFirst({
    ast: kclManager.ast,
    selectionRanges,
--- a/src/components/WasmErrBanner.tsx
+++ b/src/components/WasmErrBanner.tsx
@ -1,63 +0,0 @@
-import { Dialog } from '@headlessui/react'
-import { useState } from 'react'
-import { ActionButton } from './ActionButton'
-import { faX } from '@fortawesome/free-solid-svg-icons'
-import { useKclContext } from 'lang/KclSinglton'
-
-export function WasmErrBanner() {
-  const [isBannerDismissed, setBannerDismissed] = useState(false)
-
-  const { wasmInitFailed } = useKclContext()
-
-  if (!wasmInitFailed) return null
-
-  return (
-    <Dialog
-      className="fixed inset-0 top-auto z-50 bg-warn-20 text-warn-80 px-8 py-4"
-      open={!isBannerDismissed}
-      onClose={() => ({})}
-    >
-      <Dialog.Panel className="max-w-3xl mx-auto">
-        <div className="flex gap-2 justify-between items-start">
-          <h2 className="text-xl font-bold mb-4">
-            Problem with our WASM blob :(
-          </h2>
-          <ActionButton
-            Element="button"
-            onClick={() => setBannerDismissed(true)}
-            icon={{
-              icon: faX,
-              bgClassName:
-                'bg-warn-70 hover:bg-warn-80 dark:bg-warn-70 dark:hover:bg-warn-80',
-              iconClassName:
-                'text-warn-10 group-hover:text-warn-10 dark:text-warn-10 dark:group-hover:text-warn-10',
-            }}
-            className="!p-0 !bg-transparent !border-transparent"
-          />
-        </div>
-        <p>
-          <a
-            href="https://webassembly.org/"
-            rel="noopener noreferrer"
-            target="_blank"
-            className="text-warn-80 dark:text-warn-80 dark:hover:text-warn-70 underline"
-          >
-            WASM or web assembly
-          </a>{' '}
-          is core part of how our app works. It might because you OS is not
-          up-to-date. If you're able to update your OS to a later version, try
-          that. If not create an issue on{' '}
-          <a
-            href="https://github.com/KittyCAD/modeling-app"
-            rel="noopener noreferrer"
-            target="_blank"
-            className="text-warn-80 dark:text-warn-80 dark:hover:text-warn-70 underline"
-          >
-            our Github
-          </a>
-          .
-        </p>
-      </Dialog.Panel>
-    </Dialog>
-  )
-}
--- a/src/editor/lsp/client.ts
+++ b/src/editor/lsp/client.ts
@ -108,7 +108,6 @@ export default class Client extends jsrpc.JSONRPCServerAndClient {
          break
        }
      }
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
      messageString += message
      return
    })
--- a/src/editor/lsp/codec.ts
+++ b/src/editor/lsp/codec.ts
@ -26,7 +26,7 @@ export class Codec {
  }
 }

-// FIXME: tracing efficiency
+// FIXME: tracing effiency
 export class IntoServer
  extends Queue<Uint8Array>
  implements AsyncGenerator<Uint8Array, never, void>
--- a/src/hooks/useAbsoluteFilePath.ts
+++ b/src/hooks/useAbsoluteFilePath.ts
@ -7,6 +7,6 @@ export function useAbsoluteFilePath() {
  return (
    paths.FILE +
    '/' +
-    encodeURIComponent(routeData?.file?.path || BROWSER_FILE_NAME)
+    encodeURIComponent(routeData?.project?.path || BROWSER_FILE_NAME)
  )
 }
--- a/src/hooks/useEngineConnectionSubscriptions.ts
+++ b/src/hooks/useEngineConnectionSubscriptions.ts
@ -2,6 +2,8 @@ import { useEffect } from 'react'
 import { useStore } from 'useStore'
 import { engineCommandManager } from '../lang/std/engineConnection'
 import { useModelingContext } from './useModelingContext'
+import { v4 as uuidv4 } from 'uuid'
+import { SourceRange } from 'lang/wasm'
 import { getEventForSelectWithPoint } from 'lib/selections'

 export function useEngineConnectionSubscriptions() {
@ -11,6 +13,11 @@ export function useEngineConnectionSubscriptions() {
  }))
  const { send, context } = useModelingContext()

+  interface RangeAndId {
+    id: string
+    range: SourceRange
+  }
+
  useEffect(() => {
    if (!engineCommandManager) return

@ -35,7 +42,7 @@ export function useEngineConnectionSubscriptions() {
        const event = await getEventForSelectWithPoint(engineEvent, {
          sketchEnginePathId: context.sketchEnginePathId,
        })
-        event && send(event)
+        send(event)
      },
    })
    return () => {
--- a/src/hooks/useSetupEngineManager.ts
+++ b/src/hooks/useSetupEngineManager.ts
@ -1,5 +1,5 @@
 import { useLayoutEffect, useEffect, useRef } from 'react'
-import { parse } from '../lang/wasm'
+import { _executor, parse } from '../lang/wasm'
 import { useStore } from '../useStore'
 import { engineCommandManager } from '../lang/std/engineConnection'
 import { deferExecution } from 'lib/utils'
@ -26,6 +26,10 @@ export function useSetupEngineManager(

  const hasSetNonZeroDimensions = useRef<boolean>(false)

+  useEffect(() => {
+    kclManager.executeCode()
+  }, [])
+
  useLayoutEffect(() => {
    // Load the engine command manager once with the initial width and height,
    // then we do not want to reload it.
@ -82,14 +86,9 @@ export function useSetupEngineManager(
 }

 function getDimensions(streamWidth?: number, streamHeight?: number) {
-  const maxResolution = 2000
  const width = streamWidth ? streamWidth : 0
+  const quadWidth = Math.round(width / 4) * 4
  const height = streamHeight ? streamHeight : 0
-  const ratio = Math.min(
-    Math.min(maxResolution / width, maxResolution / height),
-    1.0
-  )
-  const quadWidth = Math.round((width * ratio) / 4) * 4
-  const quadHeight = Math.round((height * ratio) / 4) * 4
+  const quadHeight = Math.round(height / 4) * 4
  return { width: quadWidth, height: quadHeight }
 }
--- a/src/lang/KclSinglton.tsx
+++ b/src/lang/KclSinglton.tsx
@ -18,11 +18,7 @@ import { bracket } from 'lib/exampleKcl'
 import { createContext, useContext, useEffect, useState } from 'react'
 import { getNodeFromPath } from './queryAst'
 import { IndexLoaderData } from 'Router'
-import { Params, useLoaderData } from 'react-router-dom'
-import { isTauri } from 'lib/isTauri'
-import { writeTextFile } from '@tauri-apps/api/fs'
-import { toast } from 'react-hot-toast'
-import { useParams } from 'react-router-dom'
+import { useLoaderData } from 'react-router-dom'

 const PERSIST_CODE_TOKEN = 'persistCode'

@ -44,32 +40,19 @@ class KclManager {
  private _logs: string[] = []
  private _kclErrors: KCLError[] = []
  private _isExecuting = false
-  private _wasmInitFailed = true
-  private _params: Params<string> = {}

  engineCommandManager: EngineCommandManager
  private _defferer = deferExecution((code: string) => {
-    const ast = this.safeParse(code)
-    if (!ast) return
-    try {
-      const fmtAndStringify = (ast: Program) =>
-        JSON.stringify(parse(recast(ast)))
-      const isAstTheSame = fmtAndStringify(ast) === fmtAndStringify(this._ast)
-      if (isAstTheSame) return
-    } catch (e) {
-      console.error(e)
-    }
+    const ast = parse(code)
    this.executeAst(ast)
  }, 600)

-  private _isExecutingCallback: (arg: boolean) => void = () => {}
+  private _isExecutingCallback: (a: boolean) => void = () => {}
  private _codeCallBack: (arg: string) => void = () => {}
  private _astCallBack: (arg: Program) => void = () => {}
  private _programMemoryCallBack: (arg: ProgramMemory) => void = () => {}
  private _logsCallBack: (arg: string[]) => void = () => {}
  private _kclErrorsCallBack: (arg: KCLError[]) => void = () => {}
-  private _wasmInitFailedCallback: (arg: boolean) => void = () => {}
-  private _executeCallback: () => void = () => {}

  get ast() {
    return this._ast
@ -85,21 +68,6 @@ class KclManager {
  set code(code) {
    this._code = code
    this._codeCallBack(code)
-    if (isTauri()) {
-      setTimeout(() => {
-        // Wait one event loop to give a chance for params to be set
-        // Save the file to disk
-        // Note that PROJECT_ENTRYPOINT is hardcoded until we support multiple files
-        this._params.id &&
-          writeTextFile(this._params.id, code).catch((err) => {
-            // TODO: add Sentry per GH issue #254 (https://github.com/KittyCAD/modeling-app/issues/254)
-            console.error('error saving file', err)
-            toast.error('Error saving file, please check file permissions')
-          })
-      })
-    } else {
-      localStorage.setItem(PERSIST_CODE_TOKEN, code)
-    }
  }

  get programMemory() {
@ -138,27 +106,10 @@ class KclManager {
    this._isExecutingCallback(isExecuting)
  }

-  get wasmInitFailed() {
-    return this._wasmInitFailed
-  }
-  set wasmInitFailed(wasmInitFailed) {
-    this._wasmInitFailed = wasmInitFailed
-    this._wasmInitFailedCallback(wasmInitFailed)
-  }
-
-  setParams(params: Params<string>) {
-    this._params = params
-  }
-
  constructor(engineCommandManager: EngineCommandManager) {
    this.engineCommandManager = engineCommandManager
-
-    if (isTauri()) {
-      this.code = ''
-      return
-    }
    const storedCode = localStorage.getItem(PERSIST_CODE_TOKEN)
-    // TODO #819 remove zustand persistence logic in a few months
+    // TODO #819 remove zustand persistance logic in a few months
    // short term migration, shouldn't make a difference for tauri app users
    // anyway since that's filesystem based.
    const zustandStore = JSON.parse(localStorage.getItem('store') || '{}')
@ -168,7 +119,6 @@ class KclManager {
      zustandStore.state.code = ''
      localStorage.setItem('store', JSON.stringify(zustandStore))
    } else if (storedCode === null) {
-      console.log('stored brack thing')
      this.code = bracket
    } else {
      this.code = storedCode
@ -181,7 +131,6 @@ class KclManager {
    setLogs,
    setKclErrors,
    setIsExecuting,
-    setWasmInitFailed,
  }: {
    setCode: (arg: string) => void
    setProgramMemory: (arg: ProgramMemory) => void
@ -189,7 +138,6 @@ class KclManager {
    setLogs: (arg: string[]) => void
    setKclErrors: (arg: KCLError[]) => void
    setIsExecuting: (arg: boolean) => void
-    setWasmInitFailed: (arg: boolean) => void
  }) {
    this._codeCallBack = setCode
    this._programMemoryCallBack = setProgramMemory
@ -197,61 +145,30 @@ class KclManager {
    this._logsCallBack = setLogs
    this._kclErrorsCallBack = setKclErrors
    this._isExecutingCallback = setIsExecuting
-    this._wasmInitFailedCallback = setWasmInitFailed
-  }
-  registerExecuteCallback(callback: () => void) {
-    this._executeCallback = callback
-  }
-
-  safeParse(code: string): Program | null {
-    try {
-      const ast = parse(code)
-      this.kclErrors = []
-      return ast
-    } catch (e) {
-      console.error('error parsing code', e)
-      if (e instanceof KCLError) {
-        this.kclErrors = [e]
-        if (e.msg === 'file is empty') engineCommandManager.endSession()
-      }
-      return null
-    }
-  }
-
-  async ensureWasmInit() {
-    try {
-      await initPromise
-      if (this.wasmInitFailed) {
-        this.wasmInitFailed = false
-      }
-    } catch (e) {
-      this.wasmInitFailed = true
-    }
  }

  async executeAst(ast: Program = this._ast, updateCode = false) {
-    await this.ensureWasmInit()
    this.isExecuting = true
+    await initPromise
    const { logs, errors, programMemory } = await executeAst({
      ast,
      engineCommandManager: this.engineCommandManager,
      defaultPlanes: this.defaultPlanes,
    })
    this.isExecuting = false
-    this.logs = logs
-    this.kclErrors = errors
-    this.programMemory = programMemory
-    this.ast = { ...ast }
+    this._logs = logs
+    this._kclErrors = errors
+    this._programMemory = programMemory
+    this._ast = { ...ast }
    if (updateCode) {
-      this.code = recast(ast)
+      this._code = recast(ast)
+      this._codeCallBack(this._code)
    }
-    this._executeCallback()
  }
  async executeAstMock(ast: Program = this._ast, updateCode = false) {
-    await this.ensureWasmInit()
+    await initPromise
    const newCode = recast(ast)
-    const newAst = this.safeParse(newCode)
-    if (!newAst) return
+    const newAst = parse(newCode)
    await this?.engineCommandManager?.waitForReady
    if (updateCode) {
      this.setCode(recast(ast))
@ -269,7 +186,7 @@ class KclManager {
    this._programMemory = programMemory
  }
  async executeCode(code?: string) {
-    await this.ensureWasmInit()
+    await initPromise
    await this?.engineCommandManager?.waitForReady
    if (!this?.engineCommandManager?.planesInitialized()) return
    const result = await executeCode({
@ -287,17 +204,13 @@ class KclManager {
    this.ast = ast
    if (code) this.code = code
  }
-  setCode(code: string, shouldWriteFile = true) {
-    if (shouldWriteFile) {
-      // use the normal code setter
-      this.code = code
-      return
-    }
+  setCode(code: string) {
    this._code = code
    this._codeCallBack(code)
+    localStorage.setItem(PERSIST_CODE_TOKEN, code)
  }
-  setCodeAndExecute(code: string, shouldWriteFile = true) {
-    this.setCode(code, shouldWriteFile)
+  setCodeAndExecute(code: string) {
+    this.setCode(code)
    if (code.trim()) {
      this._defferer(code)
      return
@ -318,11 +231,9 @@ class KclManager {
    this.engineCommandManager.endSession()
  }
  format() {
-    const ast = this.safeParse(this.code)
-    if (!ast) return
-    this.code = recast(ast)
+    this.code = recast(parse(kclManager.code))
  }
-  // There's overlapping responsibility between updateAst and executeAst.
+  // There's overlapping resposibility between updateAst and executeAst.
  // updateAst was added as it was used a lot before xState migration so makes the port easier.
  // but should probably have think about which of the function to keep
  async updateAst(
@ -330,13 +241,15 @@ class KclManager {
    execute: boolean,
    optionalParams?: {
      focusPath?: PathToNode
+      callBack?: (ast: Program) => void
    }
  ): Promise<Selections | null> {
    const newCode = recast(ast)
-    const astWithUpdatedSource = this.safeParse(newCode)
-    if (!astWithUpdatedSource) return null
+    const astWithUpdatedSource = parse(newCode)
+    optionalParams?.callBack?.(astWithUpdatedSource)
    let returnVal: Selections | null = null

+    this.code = newCode
    if (optionalParams?.focusPath) {
      const { node } = getNodeFromPath<any>(
        astWithUpdatedSource,
@ -357,12 +270,12 @@ class KclManager {

    if (execute) {
      // Call execute on the set ast.
-      await this.executeAst(astWithUpdatedSource, true)
+      await this.executeAst(astWithUpdatedSource)
    } else {
      // When we don't re-execute, we still want to update the program
      // memory with the new ast. So we will hit the mock executor
      // instead.
-      await this.executeAstMock(astWithUpdatedSource, true)
+      await this.executeAstMock(astWithUpdatedSource)
    }
    return returnVal
  }
@ -393,7 +306,6 @@ const KclContext = createContext({
  isExecuting: kclManager.isExecuting,
  errors: kclManager.kclErrors,
  logs: kclManager.logs,
-  wasmInitFailed: kclManager.wasmInitFailed,
 })

 export function useKclContext() {
@ -414,7 +326,6 @@ export function KclContextProvider({
  const [isExecuting, setIsExecuting] = useState(false)
  const [errors, setErrors] = useState<KCLError[]>([])
  const [logs, setLogs] = useState<string[]>([])
-  const [wasmInitFailed, setWasmInitFailed] = useState(false)

  useEffect(() => {
    kclManager.registerCallBacks({
@ -424,14 +335,8 @@ export function KclContextProvider({
      setLogs,
      setKclErrors: setErrors,
      setIsExecuting,
-      setWasmInitFailed,
    })
  }, [])
-
-  const params = useParams()
-  useEffect(() => {
-    kclManager.setParams(params)
-  }, [params])
  return (
    <KclContext.Provider
      value={{
@ -441,7 +346,6 @@ export function KclContextProvider({
        isExecuting,
        errors,
        logs,
-        wasmInitFailed,
      }}
    >
      {children}
--- a/src/lang/abstractSyntaxTree.test.ts
+++ b/src/lang/abstractSyntaxTree.test.ts
@ -169,24 +169,16 @@ describe('testing function declaration', () => {
              end: 39,
              params: [
                {
-                  type: 'Parameter',
-                  identifier: {
-                    type: 'Identifier',
-                    start: 12,
-                    end: 13,
-                    name: 'a',
-                  },
-                  optional: false,
+                  type: 'Identifier',
+                  start: 12,
+                  end: 13,
+                  name: 'a',
                },
                {
-                  type: 'Parameter',
-                  identifier: {
-                    type: 'Identifier',
-                    start: 15,
-                    end: 16,
-                    name: 'b',
-                  },
-                  optional: false,
+                  type: 'Identifier',
+                  start: 15,
+                  end: 16,
+                  name: 'b',
                },
              ],
              body: {
@ -252,24 +244,16 @@ const myVar = funcN(1, 2)`
              end: 37,
              params: [
                {
-                  type: 'Parameter',
-                  identifier: {
-                    type: 'Identifier',
-                    start: 12,
-                    end: 13,
-                    name: 'a',
-                  },
-                  optional: false,
+                  type: 'Identifier',
+                  start: 12,
+                  end: 13,
+                  name: 'a',
                },
                {
-                  type: 'Parameter',
-                  identifier: {
-                    type: 'Identifier',
-                    start: 15,
-                    end: 16,
-                    name: 'b',
-                  },
-                  optional: false,
+                  type: 'Identifier',
+                  start: 15,
+                  end: 16,
+                  name: 'b',
                },
              ],
              body: {
@ -347,6 +331,9 @@ const myVar = funcN(1, 2)`
                  raw: '2',
                },
              ],
+              function: {
+                type: 'InMemory',
+              },
              optional: false,
            },
          },
@ -416,6 +403,7 @@ describe('testing pipe operator special', () => {
                      ],
                    },
                  ],
+                  function: expect.any(Object),
                  optional: false,
                },
                {
@ -452,6 +440,7 @@ describe('testing pipe operator special', () => {
                    },
                    { type: 'PipeSubstitution', start: 59, end: 60 },
                  ],
+                  function: expect.any(Object),
                  optional: false,
                },
                {
@ -524,6 +513,7 @@ describe('testing pipe operator special', () => {
                    },
                    { type: 'PipeSubstitution', start: 105, end: 106 },
                  ],
+                  function: expect.any(Object),
                  optional: false,
                },
                {
@ -560,6 +550,7 @@ describe('testing pipe operator special', () => {
                    },
                    { type: 'PipeSubstitution', start: 128, end: 129 },
                  ],
+                  function: expect.any(Object),
                  optional: false,
                },
                {
@ -582,6 +573,9 @@ describe('testing pipe operator special', () => {
                    },
                    { type: 'PipeSubstitution', start: 143, end: 144 },
                  ],
+                  function: {
+                    type: 'InMemory',
+                  },
                  optional: false,
                },
              ],
@ -661,6 +655,9 @@ describe('testing pipe operator special', () => {
                      end: 35,
                    },
                  ],
+                  function: {
+                    type: 'InMemory',
+                  },
                  optional: false,
                },
              ],
@ -1348,7 +1345,7 @@ describe('nests binary expressions correctly', () => {
      ],
    })
  })
-  it('should nest properly with two operators of equal precedence', () => {
+  it('should nest properly with two opperators of equal precedence', () => {
    const code = `const yo = 1 + 2 - 3`
    const { body } = parse(code)
    expect((body[0] as any).declarations[0].init).toEqual({
@ -1385,7 +1382,7 @@ describe('nests binary expressions correctly', () => {
      },
    })
  })
-  it('should nest properly with two operators of equal (but higher) precedence', () => {
+  it('should nest properly with two opperators of equal (but higher) precedence', () => {
    const code = `const yo = 1 * 2 / 3`
    const { body } = parse(code)
    expect((body[0] as any).declarations[0].init).toEqual({
@ -1446,7 +1443,7 @@ describe('nests binary expressions correctly', () => {
            type: 'BinaryExpression',
            operator: '*',
            start: 15,
-            end: 25,
+            end: 26,
            left: { type: 'Literal', value: 2, raw: '2', start: 15, end: 16 },
            right: {
              type: 'BinaryExpression',
@ -1570,6 +1567,7 @@ describe('test UnaryExpression', () => {
          { type: 'Literal', start: 19, end: 20, value: 4, raw: '4' },
          { type: 'Literal', start: 22, end: 25, value: 100, raw: '100' },
        ],
+        function: expect.any(Object),
        optional: false,
      },
    })
@ -1603,10 +1601,12 @@ describe('testing nested call expressions', () => {
              { type: 'Literal', start: 34, end: 35, value: 5, raw: '5' },
              { type: 'Literal', start: 37, end: 38, value: 3, raw: '3' },
            ],
+            function: expect.any(Object),
            optional: false,
          },
        },
      ],
+      function: expect.any(Object),
      optional: false,
    })
  })
@ -1638,6 +1638,7 @@ describe('should recognise callExpresions in binaryExpressions', () => {
            },
            { type: 'PipeSubstitution', start: 25, end: 26 },
          ],
+          function: expect.any(Object),
          optional: false,
        },
        right: { type: 'Literal', value: 1, raw: '1', start: 30, end: 31 },
--- a/src/lang/errors.ts
+++ b/src/lang/errors.ts
@ -18,20 +18,6 @@ export class KCLError {
  }
 }

-export class KCLLexicalError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number][]) {
-    super('lexical', msg, sourceRanges)
-    Object.setPrototypeOf(this, KCLSyntaxError.prototype)
-  }
-}
-
-export class KCLInternalError extends KCLError {
-  constructor(msg: string, sourceRanges: [number, number][]) {
-    super('internal', msg, sourceRanges)
-    Object.setPrototypeOf(this, KCLSyntaxError.prototype)
-  }
-}
-
 export class KCLSyntaxError extends KCLError {
  constructor(msg: string, sourceRanges: [number, number][]) {
    super('syntax', msg, sourceRanges)
--- a/src/lang/getNodePathFromSourceRange.test.ts
+++ b/src/lang/getNodePathFromSourceRange.test.ts
@ -1,5 +1,5 @@
 import { getNodePathFromSourceRange, getNodeFromPath } from './queryAst'
-import { Identifier, parse, initPromise, Parameter } from './wasm'
+import { Identifier, parse, initPromise } from './wasm'

 beforeAll(() => initPromise)

@ -46,7 +46,7 @@ const b1 = cube([0,0], 10)`

    const ast = parse(code)
    const nodePath = getNodePathFromSourceRange(ast, sourceRange)
-    const node = getNodeFromPath<Parameter>(ast, nodePath).node
+    const node = getNodeFromPath<Identifier>(ast, nodePath).node

    expect(nodePath).toEqual([
      ['body', ''],
@ -57,8 +57,8 @@ const b1 = cube([0,0], 10)`
      ['params', 'FunctionExpression'],
      [0, 'index'],
    ])
-    expect(node.type).toBe('Parameter')
-    expect(node.identifier.name).toBe('pos')
+    expect(node.type).toBe('Identifier')
+    expect(node.name).toBe('pos')
  })
  it('gets path right for deep within function definition body', () => {
    const code = `fn cube = (pos, scale) => {
--- a/src/lang/modifyAst.ts
+++ b/src/lang/modifyAst.ts
@ -310,7 +310,7 @@ export function extrudeSketch(
  const name = findUniqueName(node, 'part')
  const VariableDeclaration = createVariableDeclaration(name, extrudeCall)
  let showCallIndex = getShowIndex(_node)
-  if (showCallIndex === -1) {
+  if (showCallIndex == -1) {
    // We didn't find a show, so let's just append everything
    showCallIndex = _node.body.length
  }
@ -480,6 +480,21 @@ export function createCallExpressionStdLib(
      end: 0,
      name,
    },
+    function: {
+      type: 'StdLib',
+      func: {
+        // We only need the name here to map it back when it serializes
+        // to rust, don't worry about the rest.
+        name,
+        summary: '',
+        description: '',
+        tags: [],
+        returnValue: { type: '', required: false, name: '', schema: {} },
+        args: [],
+        unpublished: false,
+        deprecated: false,
+      },
+    },
    optional: false,
    arguments: args,
  }
@ -499,6 +514,9 @@ export function createCallExpression(
      end: 0,
      name,
    },
+    function: {
+      type: 'InMemory',
+    },
    optional: false,
    arguments: args,
  }
--- a/src/lang/queryAst.ts
+++ b/src/lang/queryAst.ts
@ -247,10 +247,10 @@ function moreNodePathFromSourceRange(
  if (_node.type === 'FunctionExpression' && isInRange) {
    for (let i = 0; i < _node.params.length; i++) {
      const param = _node.params[i]
-      if (param.identifier.start <= start && param.identifier.end >= end) {
+      if (param.start <= start && param.end >= end) {
        path.push(['params', 'FunctionExpression'])
        path.push([i, 'index'])
-        return moreNodePathFromSourceRange(param.identifier, sourceRange, path)
+        return moreNodePathFromSourceRange(param, sourceRange, path)
      }
    }
    if (_node.body.start <= start && _node.body.end >= end) {
--- a/src/lang/std/README.md
+++ b/src/lang/std/README.md
@ -2,5 +2,5 @@ The std is as expected, tools that are provided with the language.

 For this language that means functions.

-However because programmatically changing the source code is a first class citizen in this lang, there needs to be helpers for adding and modifying these function calls,
+However because programatically changing the source code is a first class citizen in this lang, there needs to be helpes for adding and modifying these function calls,
 So it makes sense to group some of these together.
--- a/src/lang/std/engineConnection.ts
+++ b/src/lang/std/engineConnection.ts
@ -216,26 +216,6 @@ export class EngineConnection {
      }
    })

-    this.pc.addEventListener('icecandidateerror', (_event) => {
-      const event = _event as RTCPeerConnectionIceErrorEvent
-      console.error(
-        `ICE candidate returned an error: ${event.errorCode}: ${event.errorText} for ${event.url}`
-      )
-    })
-
-    this.pc.addEventListener('connectionstatechange', (event) => {
-      if (this.pc?.iceConnectionState === 'connected') {
-        if (this.shouldTrace()) {
-          iceSpan.resolve?.()
-        }
-      } else if (this.pc?.iceConnectionState === 'failed') {
-        // failed is a terminal state; let's explicitly kill the
-        // connection to the server at this point.
-        console.log('failed to negotiate ice connection; restarting')
-        this.close()
-      }
-    })
-
    this.websocket.addEventListener('open', (event) => {
      if (this.shouldTrace()) {
        websocketSpan.resolve?.()
@ -371,6 +351,19 @@ export class EngineConnection {
        // until the end of this function is setup of our end of the
        // PeerConnection and waiting for events to fire our callbacks.

+        this.pc.addEventListener('connectionstatechange', (event) => {
+          if (this.pc?.iceConnectionState === 'connected') {
+            if (this.shouldTrace()) {
+              iceSpan.resolve?.()
+            }
+          } else if (this.pc?.iceConnectionState === 'failed') {
+            // failed is a terminal state; let's explicitly kill the
+            // connection to the server at this point.
+            console.log('failed to negotiate ice connection; restarting')
+            this.close()
+          }
+        })
+
        this.pc.addEventListener('icecandidate', (event) => {
          if (!this.pc || !this.websocket) return
          if (event.candidate !== null) {
@ -457,18 +450,18 @@ export class EngineConnection {
            videoTrackStats.forEach((videoTrackReport) => {
              if (videoTrackReport.type === 'inbound-rtp') {
                client_metrics.rtc_frames_decoded =
-                  videoTrackReport.framesDecoded || 0
+                  videoTrackReport.framesDecoded
                client_metrics.rtc_frames_dropped =
-                  videoTrackReport.framesDropped || 0
+                  videoTrackReport.framesDropped
                client_metrics.rtc_frames_received =
-                  videoTrackReport.framesReceived || 0
+                  videoTrackReport.framesReceived
                client_metrics.rtc_frames_per_second =
                  videoTrackReport.framesPerSecond || 0
                client_metrics.rtc_freeze_count =
                  videoTrackReport.freezeCount || 0
-                client_metrics.rtc_jitter_sec = videoTrackReport.jitter || 0.0
+                client_metrics.rtc_jitter_sec = videoTrackReport.jitter
                client_metrics.rtc_keyframes_decoded =
-                  videoTrackReport.keyFramesDecoded || 0
+                  videoTrackReport.keyFramesDecoded
                client_metrics.rtc_total_freezes_duration_sec =
                  videoTrackReport.totalFreezesDuration || 0
              } else if (videoTrackReport.type === 'transport') {
@ -640,10 +633,7 @@ export class EngineCommandManager {

    // If we already have an engine connection, just need to resize the stream.
    if (this.engineConnection) {
-      this.handleResize({
-        streamWidth: width,
-        streamHeight: height,
-      })
+      this.handleResize({ streamWidth: width, streamHeight: height })
      return
    }

@ -674,7 +664,7 @@ export class EngineCommandManager {
          },
        })

-        // Initialize the planes.
+        // Inisialize the planes.
        this.initPlanes().then(() => {
          // We execute the code here to make sure if the stream was to
          // restart in a session, we want to make sure to execute the code.
@ -897,9 +887,8 @@ export class EngineCommandManager {
  }
  endSession() {
    // TODO: instead of sending a single command with `object_ids: Object.keys(this.artifactMap)`
-    // we need to loop over them each individually because if the engine doesn't recognise a single
+    // we need to loop over them each individualy because if the engine doesn't recognise a single
    // id the whole command fails.
-    const artifactsToDelete: any = {}
    Object.entries(this.artifactMap).forEach(([id, artifact]) => {
      const artifactTypesToDelete: ArtifactMap[string]['commandType'][] = [
        // 'start_path' creates a new scene object for the path, which is why it needs to be deleted,
@ -909,9 +898,7 @@ export class EngineCommandManager {
        'start_path',
      ]
      if (!artifactTypesToDelete.includes(artifact.commandType)) return
-      artifactsToDelete[id] = artifact
-    })
-    Object.keys(artifactsToDelete).forEach((id) => {
+
      const deletCmd: EngineCommand = {
        type: 'modeling_cmd_req',
        cmd_id: uuidv4(),
@ -995,7 +982,7 @@ export class EngineCommandManager {
      if (parseCommand.type === 'modeling_cmd_req')
        return this.handlePendingCommand(id, parseCommand?.cmd, range)
    }
-    throw Error('shouldnt reach here')
+    throw 'shouldnt reach here'
  }
  handlePendingCommand(
    id: string,
--- a/src/lang/std/sketch.test.ts
+++ b/src/lang/std/sketch.test.ts
@ -138,7 +138,6 @@ show(mySketch001)`
      node: ast,
      programMemory,
      to: [2, 3],
-      from: [0, 0],
      fnName: 'lineTo',
      pathToNode: [
        ['body', ''],
--- a/src/lang/std/sketch.ts
+++ b/src/lang/std/sketch.ts
@ -20,6 +20,7 @@ import {
 import { isLiteralArrayOrStatic } from './sketchcombos'
 import { toolTips, ToolTip } from '../../useStore'
 import { createPipeExpression, splitPathAtPipeExpression } from '../modifyAst'
+import { generateUuidFromHashSeed } from '../../lib/uuid'

 import { SketchLineHelper, ModifyAstBase, TransformCallback } from './stdTypes'

@ -91,12 +92,18 @@ export function createFirstArg(
  throw new Error('all sketch line types should have been covered')
 }

-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 type LineData = {
  from: [number, number, number]
  to: [number, number, number]
 }

+function makeId(seed: string | any) {
+  if (typeof seed === 'string') {
+    return generateUuidFromHashSeed(seed)
+  }
+  return generateUuidFromHashSeed(JSON.stringify(seed))
+}
+
 export const lineTo: SketchLineHelper = {
  add: ({
    node,
@ -186,6 +193,9 @@ export const line: SketchLineHelper = {
      pathToNode,
      'VariableDeclarator'
    )
+    const variableName = varDec.id.name
+    const sketch = previousProgramMemory?.root?.[variableName]
+    if (sketch.type !== 'SketchGroup') throw new Error('not a SketchGroup')

    const newXVal = createLiteral(roundOff(to[0] - from[0], 2))
    const newYVal = createLiteral(roundOff(to[1] - from[1], 2))
@ -243,6 +253,9 @@ export const line: SketchLineHelper = {
    ])

    if (callExpression.arguments?.[0].type === 'ObjectExpression') {
+      const toProp = callExpression.arguments?.[0].properties?.find(
+        ({ key }) => key.name === 'to'
+      )
      mutateObjExpProp(callExpression.arguments?.[0], toArrExp, 'to')
    } else {
      mutateArrExp(callExpression.arguments?.[0], toArrExp)
@ -946,7 +959,7 @@ export function compareVec2Epsilon(
 ) {
  const compareEpsilon = 0.015625 // or 2^-6
  const xDifference = Math.abs(vec1[0] - vec2[0])
-  const yDifference = Math.abs(vec1[1] - vec2[1])
+  const yDifference = Math.abs(vec1[0] - vec2[0])
  return xDifference < compareEpsilon && yDifference < compareEpsilon
 }

@ -956,20 +969,27 @@ export function addNewSketchLn({
  to,
  fnName,
  pathToNode,
-  from,
-}: CreateLineFnCallArgs): {
+}: Omit<CreateLineFnCallArgs, 'from'>): {
  modifiedAst: Program
  pathToNode: PathToNode
 } {
  const node = JSON.parse(JSON.stringify(_node))
  const { add, updateArgs } = sketchLineHelperMap?.[fnName] || {}
  if (!add || !updateArgs) throw new Error('not a sketch line helper')
-  getNodeFromPath<VariableDeclarator>(node, pathToNode, 'VariableDeclarator')
-  getNodeFromPath<PipeExpression | CallExpression>(
+  const { node: varDec } = getNodeFromPath<VariableDeclarator>(
    node,
    pathToNode,
-    'PipeExpression'
+    'VariableDeclarator'
  )
+  const { node: pipeExp, shallowPath: pipePath } = getNodeFromPath<
+    PipeExpression | CallExpression
+  >(node, pathToNode, 'PipeExpression')
+  const variableName = varDec.id.name
+  const sketch = previousProgramMemory?.root?.[variableName]
+  if (sketch.type !== 'SketchGroup') throw new Error('not a SketchGroup')
+
+  const last = sketch.value[sketch.value.length - 1] || sketch.start
+  const from = last.to
  return add({
    node,
    previousProgramMemory,
--- a/src/lang/std/sketchConstraints.test.ts
+++ b/src/lang/std/sketchConstraints.test.ts
@ -50,7 +50,7 @@ async function testingSwapSketchFnCall({
  }
 }

-describe('testing swapping out sketch calls with xLine/xLineTo', () => {
+describe('testing swaping out sketch calls with xLine/xLineTo', () => {
  const bigExampleArr = [
    `const part001 = startSketchOn('XY')`,
    `  |> startProfileAt([0, 0], %)`,
@ -178,7 +178,7 @@ describe('testing swapping out sketch calls with xLine/xLineTo', () => {
      constraintType: 'horizontal',
    })
    const expectedLine = "xLine({ length: -0.86, tag: 'abc4' }, %)"
-    // hmm "-0.86" is correct since the angle is 104, but need to make sure this is compatible `-myVar`
+    // hmm "-0.86" is correct since the angle is 104, but need to make sure this is compatiable `-myVar`
    expect(newCode).toContain(expectedLine)
    // new line should start at the same place as the old line
    expect(originalRange[0]).toBe(newCode.indexOf(expectedLine))
@ -268,7 +268,7 @@ describe('testing swapping out sketch calls with xLine/xLineTo', () => {
  })
 })

-describe('testing swapping out sketch calls with xLine/xLineTo while keeping variable/identifiers intact', () => {
+describe('testing swaping out sketch calls with xLine/xLineTo while keeping variable/identifiers intact', () => {
  // Enable rotations #152
  const variablesExampleArr = [
    `const lineX = -1`,
--- a/src/lang/std/sketchcombos.test.ts
+++ b/src/lang/std/sketchcombos.test.ts
@ -108,7 +108,7 @@ const part001 = startSketchOn('XY')
  |> line([myVar, 1], %) // ln-should use legLen for y
  |> line([myVar, -1], %) // ln-legLen but negative
  |> line([-0.62, -1.54], %) // ln-should become angledLine
-  |> angledLine([myVar, 1.04], %) // ln-use segLen for second arg
+  |> angledLine([myVar, 1.04], %) // ln-use segLen for secound arg
  |> angledLine([45, 1.04], %) // ln-segLen again
  |> angledLineOfXLength([54, 2.35], %) // ln-should be transformed to angledLine
  |> angledLineOfXLength([50, myVar], %) // ln-should use legAngX to calculate angle
@ -163,7 +163,7 @@ const part001 = startSketchOn('XY')
       -legLen(segLen('seg01', %), myVar)
     ], %) // ln-legLen but negative
  |> angledLine([-112, segLen('seg01', %)], %) // ln-should become angledLine
-  |> angledLine([myVar, segLen('seg01', %)], %) // ln-use segLen for second arg
+  |> angledLine([myVar, segLen('seg01', %)], %) // ln-use segLen for secound arg
  |> angledLine([45, segLen('seg01', %)], %) // ln-segLen again
  |> angledLine([54, segLen('seg01', %)], %) // ln-should be transformed to angledLine
  |> angledLineOfXLength([
@ -471,7 +471,7 @@ async function helperThing(
 }

 describe('testing getConstraintLevelFromSourceRange', () => {
-  it('should divide up lines into free, partial and fully contrained', () => {
+  it('should devide up lines into free, partial and fully contrained', () => {
    const code = `const baseLength = 3
 const baseThick = 1
 const armThick = 0.5
--- a/src/lang/std/stdTypes.ts
+++ b/src/lang/std/stdTypes.ts
@ -24,7 +24,6 @@ export interface PathReturn {

 export interface ModifyAstBase {
  node: Program
-  // TODO #896: Remove ProgramMemory from this interface
  previousProgramMemory: ProgramMemory
  pathToNode: PathToNode
 }
--- a/src/lang/wasm.ts
+++ b/src/lang/wasm.ts
@ -20,7 +20,6 @@ export type { ObjectExpression } from '../wasm-lib/kcl/bindings/ObjectExpression
 export type { MemberExpression } from '../wasm-lib/kcl/bindings/MemberExpression'
 export type { PipeExpression } from '../wasm-lib/kcl/bindings/PipeExpression'
 export type { VariableDeclaration } from '../wasm-lib/kcl/bindings/VariableDeclaration'
-export type { Parameter } from '../wasm-lib/kcl/bindings/Parameter'
 export type { PipeSubstitution } from '../wasm-lib/kcl/bindings/PipeSubstitution'
 export type { Identifier } from '../wasm-lib/kcl/bindings/Identifier'
 export type { UnaryExpression } from '../wasm-lib/kcl/bindings/UnaryExpression'
@ -67,16 +66,13 @@ const initialise = async () => {
    typeof window === 'undefined'
      ? 'http://127.0.0.1:3000'
      : window.location.origin.includes('tauri://localhost')
-      ? 'tauri://localhost' // custom protocol for macOS
-      : window.location.origin.includes('tauri.localhost')
-      ? 'https://tauri.localhost' // fallback for Windows
+      ? 'tauri://localhost'
      : window.location.origin.includes('localhost')
      ? 'http://localhost:3000'
      : window.location.origin && window.location.origin !== 'null'
      ? window.location.origin
      : 'http://localhost:3000'
  const fullUrl = baseUrl + '/wasm_lib_bg.wasm'
-  console.log(`Full URL for WASM: ${fullUrl}`)
  const input = await fetch(fullUrl)
  const buffer = await input.arrayBuffer()
  return init(buffer)
--- a/src/lib/exampleKcl.ts
+++ b/src/lib/exampleKcl.ts
@ -26,4 +26,5 @@ const bracket = startSketchOn('XY')
  |> close(%)
  |> extrude(width, %)

+show(bracket)
 `
--- a/src/lib/selections.ts
+++ b/src/lib/selections.ts
@ -15,7 +15,7 @@ app needs these selections to be based on cursors, therefore the app must
 be in control of selections. On top of that because we need to set cursor
 positions in code-mirror for selections, both from app logic, and still
 allow the user to add multiple cursors like a normal editor, it's best to
-let code mirror control cursor positions and associate those source ranges
+let code mirror control cursor positions and assosiate those source ranges
 with entity ids from code-mirror events later.

 So it's a lot of back and forth. conceptually the back and forth is:
@ -43,7 +43,7 @@ In detail:

 1) Click commands are mostly sent in stream.tsx search for
  "select_with_point"
-2) The handler for when the engine sends back entity ids calls
+2) The handler for when the engine sends back entitiy ids calls
  getEventForSelectWithPoint, it fires an XState event to update our
  selections is xstate context
 3 and 4) The XState handler for the above uses handleSelectionBatch and
@ -102,8 +102,8 @@ export async function getEventForSelectWithPoint(
    Models['OkModelingCmdResponse_type'],
    { type: 'select_with_point' }
  >,
-  { sketchEnginePathId }: { sketchEnginePathId?: string }
-): Promise<ModelingMachineEvent | null> {
+  { sketchEnginePathId }: { sketchEnginePathId: string }
+): Promise<ModelingMachineEvent> {
  if (!data?.entity_id) {
    return {
      type: 'Set selection',
@ -120,7 +120,6 @@ export async function getEventForSelectWithPoint(
      },
    }
  }
-  if (!sketchEnginePathId) return null
  // selected a vertex
  const res = await engineCommandManager.sendSceneCommand({
    type: 'modeling_cmd_req',
@ -304,7 +303,7 @@ export function resetAndSetEngineEntitySelectionCmds(
  selections: SelectionToEngine[]
 ): Models['WebSocketRequest_type'][] {
  if (!engineCommandManager.engineConnection?.isReady()) {
-    console.log('engine connection is not ready')
+    console.log('engine connection isnt ready')
    return []
  }
  return [
--- a/src/lib/tauriFS.ts
+++ b/src/lib/tauriFS.ts
@ -5,7 +5,7 @@ import {
  readDir,
  writeTextFile,
 } from '@tauri-apps/api/fs'
-import { documentDir, homeDir, sep } from '@tauri-apps/api/path'
+import { documentDir, homeDir } from '@tauri-apps/api/path'
 import { isTauri } from './isTauri'
 import { ProjectWithEntryPointMetadata } from '../Router'
 import { metadata } from 'tauri-plugin-fs-extra-api'
@ -70,7 +70,7 @@ export async function getProjectsInDir(projectDir: string) {

  const projectsWithMetadata = await Promise.all(
    readProjects.map(async (p) => ({
-      entrypointMetadata: await metadata(p.path + sep + PROJECT_ENTRYPOINT),
+      entrypointMetadata: await metadata(p.path + '/' + PROJECT_ENTRYPOINT),
      ...p,
    }))
  )
@ -210,8 +210,7 @@ export function sortProject(project: FileEntry[]): FileEntry[] {
 // Creates a new file in the default directory with the default project name
 // Returns the path to the new file
 export async function createNewProject(
-  path: string,
-  initCode = ''
+  path: string
 ): Promise<ProjectWithEntryPointMetadata> {
  if (!isTauri) {
    throw new Error('createNewProject() can only be called from a Tauri app')
@ -225,23 +224,21 @@ export async function createNewProject(
    })
  }

-  await writeTextFile(path + sep + PROJECT_ENTRYPOINT, initCode).catch(
-    (err) => {
-      console.error('Error creating new file:', err)
-      throw err
-    }
-  )
+  await writeTextFile(path + '/' + PROJECT_ENTRYPOINT, '').catch((err) => {
+    console.error('Error creating new file:', err)
+    throw err
+  })

  const m = await metadata(path)

  return {
-    name: path.slice(path.lastIndexOf(sep) + 1),
+    name: path.slice(path.lastIndexOf('/') + 1),
    path: path,
    entrypointMetadata: m,
    children: [
      {
        name: PROJECT_ENTRYPOINT,
-        path: path + sep + PROJECT_ENTRYPOINT,
+        path: path + '/' + PROJECT_ENTRYPOINT,
        children: [],
      },
    ],
--- a/src/lib/testHelpers.ts
+++ b/src/lib/testHelpers.ts
@ -9,7 +9,6 @@ import { v4 as uuidv4 } from 'uuid'
 type WebSocketResponse = Models['OkWebSocketResponseData_type']

 class MockEngineCommandManager {
-  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
  constructor(mockParams: {
    setIsStreamReady: (isReady: boolean) => void
    setMediaStream: (stream: MediaStream) => void
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
--- a/src/machines/modelingMachine.typegen.ts
+++ b/src/machines/modelingMachine.typegen.ts
@ -52,20 +52,19 @@
 "Update code selection cursors": "Complete line" | "Deselect all" | "Deselect axis" | "Deselect edge" | "Deselect face" | "Deselect point" | "Deselect segment" | "Select edge" | "Select face" | "Select point" | "Select segment";
 "create path": "Select default plane";
 "default_camera_disable_sketch_mode": "Cancel";
-"edit mode enter": "Enter sketch" | "Re-execute";
+"edit mode enter": "Enter sketch";
 "edit_mode_exit": "Cancel";
-"equip select": "CancelSketch" | "Constrain equal length" | "Constrain horizontally align" | "Constrain parallel" | "Constrain remove constraints" | "Constrain vertically align" | "Deselect point" | "Deselect segment" | "Enter sketch" | "Make segment horizontal" | "Make segment vertical" | "Re-execute" | "Select default plane" | "Select point" | "Select segment" | "Set selection" | "done.invoke.get-angle-info" | "done.invoke.get-horizontal-info" | "done.invoke.get-length-info" | "done.invoke.get-perpendicular-distance-info" | "done.invoke.get-vertical-info" | "error.platform.get-angle-info" | "error.platform.get-horizontal-info" | "error.platform.get-length-info" | "error.platform.get-perpendicular-distance-info" | "error.platform.get-vertical-info";
+"equip select": "CancelSketch" | "Constrain equal length" | "Constrain horizontally align" | "Constrain parallel" | "Constrain remove constraints" | "Constrain vertically align" | "Deselect point" | "Deselect segment" | "Enter sketch" | "Make segment horizontal" | "Make segment vertical" | "Select default plane" | "Select point" | "Select segment" | "Set selection" | "done.invoke.get-angle-info" | "done.invoke.get-horizontal-info" | "done.invoke.get-length-info" | "done.invoke.get-perpendicular-distance-info" | "done.invoke.get-vertical-info" | "error.platform.get-angle-info" | "error.platform.get-horizontal-info" | "error.platform.get-length-info" | "error.platform.get-perpendicular-distance-info" | "error.platform.get-vertical-info";
 "hide default planes": "Cancel" | "Select default plane" | "xstate.stop";
 "reset sketch metadata": "Cancel" | "Select default plane";
 "set default plane id": "Select default plane";
 "set sketch metadata": "Enter sketch";
-"set sketchMetadata from pathToNode": "Re-execute";
 "set tool": "Equip new tool";
 "set tool line": "Equip tool";
-"set tool move": "Equip move tool" | "Re-execute" | "Set selection";
+"set tool move": "Equip move tool" | "Set selection";
 "show default planes": "Enter sketch";
 "sketch exit execute": "Cancel" | "Complete line" | "xstate.stop";
-"sketch mode enabled": "Enter sketch" | "Re-execute" | "Select default plane";
+"sketch mode enabled": "Enter sketch" | "Select default plane";
 "toast extrude failed": "";
        };
        eventsCausingDelays: {
--- a/src/routes/Home.tsx
+++ b/src/routes/Home.tsx
@ -29,7 +29,6 @@ import useStateMachineCommands from '../hooks/useStateMachineCommands'
 import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { DEFAULT_PROJECT_NAME } from 'machines/settingsMachine'
-import { sep } from '@tauri-apps/api/path'

 // This route only opens in the Tauri desktop context for now,
 // as defined in Router.tsx, so we can use the Tauri APIs and types.
@ -59,7 +58,7 @@ const Home = () => {
          setCommandBarOpen(false)
          navigate(
            `${paths.FILE}/${encodeURIComponent(
-              context.defaultDirectory + sep + event.data.name
+              context.defaultDirectory + '/' + event.data.name
            )}`
          )
        }
@ -92,7 +91,7 @@ const Home = () => {
          name = interpolateProjectNameWithIndex(name, nextIndex)
        }

-        await createNewProject(context.defaultDirectory + sep + name)
+        await createNewProject(context.defaultDirectory + '/' + name)

        if (shouldUpdateDefaultProjectName) {
          sendToSettings({
@ -115,8 +114,8 @@ const Home = () => {
        }

        await renameFile(
-          context.defaultDirectory + sep + oldName,
-          context.defaultDirectory + sep + name
+          context.defaultDirectory + '/' + oldName,
+          context.defaultDirectory + '/' + name
        )
        return `Successfully renamed "${oldName}" to "${name}"`
      },
@ -124,7 +123,7 @@ const Home = () => {
        context: ContextFrom<typeof homeMachine>,
        event: EventFrom<typeof homeMachine, 'Delete project'>
      ) => {
-        await removeDir(context.defaultDirectory + sep + event.data.name, {
+        await removeDir(context.defaultDirectory + '/' + event.data.name, {
          recursive: true,
        })
        return `Successfully deleted "${event.data.name}"`
@ -173,9 +172,9 @@ const Home = () => {
  }

  return (
-    <div className="relative flex flex-col h-screen overflow-hidden">
+    <div className="h-screen overflow-hidden relative flex flex-col">
      <AppHeader showToolbar={false} />
-      <div className="w-full max-w-5xl px-4 mx-auto my-24 overflow-y-auto lg:px-0">
+      <div className="my-24 px-4 lg:px-0 overflow-y-auto max-w-5xl w-full mx-auto">
        <section className="flex justify-between">
          <h1 className="text-3xl text-bold">Your Projects</h1>
          <div className="flex">
@ -236,7 +235,7 @@ const Home = () => {
          ) : (
            <>
              {projects.length > 0 ? (
-                <ul className="grid w-full grid-cols-4 gap-4 my-8">
+                <ul className="my-8 w-full grid grid-cols-4 gap-4">
                  {projects.sort(getSortFunction(sort)).map((project) => (
                    <ProjectCard
                      key={project.name}
@ -247,7 +246,7 @@ const Home = () => {
                  ))}
                </ul>
              ) : (
-                <p className="p-4 my-8 border border-dashed rounded border-chalkboard-30 dark:border-chalkboard-70">
+                <p className="rounded my-8 border border-dashed border-chalkboard-30 dark:border-chalkboard-70 p-4">
                  No Projects found, ready to make your first one?
                </p>
              )}
--- a/src/routes/Onboarding/Export.tsx
+++ b/src/routes/Onboarding/Export.tsx
@ -24,15 +24,8 @@ export default function Export() {
            Try opening the project menu and clicking "Export Model".
          </p>
          <p className="my-4">
-            KittyCAD Modeling App uses{' '}
-            <a
-              href="https://kittycad.io/gltf-format-extension"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              our open-source extension proposal
-            </a>{' '}
-            for the GLTF file format.{' '}
+            KittyCAD Modeling App uses our open-source extension proposal for
+            the GLTF file format.{' '}
            <a
              href="https://kittycad.io/docs/api/convert-cad-file"
              rel="noopener noreferrer"
--- a/src/routes/Onboarding/FutureWork.tsx
+++ b/src/routes/Onboarding/FutureWork.tsx
@ -4,23 +4,13 @@ import { useDismiss } from '.'
 import { useEffect } from 'react'
 import { bracket } from 'lib/exampleKcl'
 import { kclManager } from 'lang/KclSinglton'
-import { useModelingContext } from 'hooks/useModelingContext'

 export default function FutureWork() {
-  const { send } = useModelingContext()
  const dismiss = useDismiss()

  useEffect(() => {
-    if (kclManager.engineCommandManager.engineConnection?.isReady()) {
-      // If the engine is ready, promptly execute the loaded code
-      kclManager.setCodeAndExecute(bracket)
-    } else {
-      // Otherwise, just set the code and wait for the connection to complete
-      kclManager.setCode(bracket)
-    }
-
-    send({ type: 'Cancel' }) // in case the user hit 'Next' while still in sketch mode
-  }, [send])
+    kclManager.setCode(bracket)
+  }, [kclManager.setCode])

  return (
    <div className="fixed grid justify-center items-center inset-0 bg-chalkboard-100/50 z-50">
--- a/src/routes/Onboarding/Introduction.tsx
+++ b/src/routes/Onboarding/Introduction.tsx
@ -10,7 +10,6 @@ import { useGlobalStateContext } from 'hooks/useGlobalStateContext'
 import { Themes, getSystemTheme } from 'lib/theme'
 import { bracket } from 'lib/exampleKcl'
 import {
-  PROJECT_ENTRYPOINT,
  createNewProject,
  getNextProjectIndex,
  getProjectsInDir,
@ -21,7 +20,6 @@ import { useNavigate } from 'react-router-dom'
 import { paths } from 'Router'
 import { useEffect } from 'react'
 import { kclManager } from 'lang/KclSinglton'
-import { sep } from '@tauri-apps/api/path'

 function OnboardingWithNewFile() {
  const navigate = useNavigate()
@ -43,19 +41,12 @@ function OnboardingWithNewFile() {
      ONBOARDING_PROJECT_NAME,
      nextIndex
    )
-    const newFile = await createNewProject(
-      defaultDirectory + sep + name,
-      bracket
-    )
-    navigate(
-      `${paths.FILE}/${encodeURIComponent(
-        newFile.path + sep + PROJECT_ENTRYPOINT
-      )}${paths.ONBOARDING.INDEX}`
-    )
+    const newFile = await createNewProject(defaultDirectory + '/' + name)
+    navigate(`${paths.FILE}/${encodeURIComponent(newFile.path)}`)
  }
  return (
-    <div className="fixed inset-0 z-50 grid place-content-center bg-chalkboard-110/50">
-      <div className="max-w-3xl p-8 rounded bg-chalkboard-10 dark:bg-chalkboard-90">
+    <div className="fixed grid place-content-center inset-0 bg-chalkboard-110/50 z-50">
+      <div className="max-w-3xl bg-chalkboard-10 dark:bg-chalkboard-90 p-8 rounded">
        {!isTauri() ? (
          <>
            <h1 className="text-2xl font-bold text-warn-80 dark:text-warn-10">
@ -82,7 +73,7 @@ function OnboardingWithNewFile() {
              <ActionButton
                Element="button"
                onClick={() => {
-                  kclManager.setCodeAndExecute(bracket)
+                  kclManager.setCode(bracket)
                  next()
                }}
                icon={{ icon: faArrowRight }}
@ -93,7 +84,7 @@ function OnboardingWithNewFile() {
          </>
        ) : (
          <>
-            <h1 className="flex flex-wrap items-center gap-4 text-2xl font-bold">
+            <h1 className="text-2xl font-bold flex gap-4 flex-wrap items-center">
              Would you like to create a new project?
            </h1>
            <section className="my-12">
@ -119,11 +110,7 @@ function OnboardingWithNewFile() {
              </ActionButton>
              <ActionButton
                Element="button"
-                onClick={() => {
-                  createAndOpenNewProject()
-                  kclManager.setCode(bracket, false)
-                  dismiss()
-                }}
+                onClick={createAndOpenNewProject}
                icon={{ icon: faArrowRight }}
              >
                Make a new project
@ -151,22 +138,21 @@ export default function Introduction() {
      : ''
  const dismiss = useDismiss()
  const next = useNextClick(onboardingPaths.CAMERA)
-  const isStarterCode = kclManager.code === '' || kclManager.code === bracket

  useEffect(() => {
    if (kclManager.code === '') kclManager.setCode(bracket)
-  }, [])
+  }, [kclManager.code, kclManager.setCode])

-  return isStarterCode ? (
-    <div className="fixed inset-0 z-50 grid place-content-center bg-chalkboard-110/50">
-      <div className="max-w-3xl p-8 rounded bg-chalkboard-10 dark:bg-chalkboard-90">
-        <h1 className="flex flex-wrap items-center gap-4 text-2xl font-bold">
+  return !(kclManager.code !== '' && kclManager.code !== bracket) ? (
+    <div className="fixed grid place-content-center inset-0 bg-chalkboard-110/50 z-50">
+      <div className="max-w-3xl bg-chalkboard-10 dark:bg-chalkboard-90 p-8 rounded">
+        <h1 className="text-2xl font-bold flex gap-4 flex-wrap items-center">
          <img
            src={`/kcma-logomark${getLogoTheme()}.svg`}
            alt="KittyCAD Modeling App"
-            className="h-20 max-w-full"
+            className="max-w-full h-20"
          />
-          <span className="px-3 py-1 text-base rounded-full bg-energy-10 text-energy-80">
+          <span className="bg-energy-10 text-energy-80 px-3 py-1 rounded-full text-base">
            Alpha
          </span>
        </h1>
--- a/src/routes/Onboarding/Sketching.tsx
+++ b/src/routes/Onboarding/Sketching.tsx
@ -11,13 +11,7 @@ export default function Sketching() {
  const next = useNextClick(onboardingPaths.FUTURE_WORK)

  useEffect(() => {
-    if (kclManager.engineCommandManager.engineConnection?.isReady()) {
-      // If the engine is ready, promptly execute the loaded code
-      kclManager.setCodeAndExecute('')
-    } else {
-      // Otherwise, just set the code and wait for the connection to complete
-      kclManager.setCode('')
-    }
+    kclManager.setCode('')
  }, [])

  return (
--- a/src/routes/Settings.tsx
+++ b/src/routes/Settings.tsx
@ -31,8 +31,6 @@ import {
  interpolateProjectNameWithIndex,
 } from 'lib/tauriFS'
 import { ONBOARDING_PROJECT_NAME } from './Onboarding'
-import { sep } from '@tauri-apps/api/path'
-import { bracket } from 'lib/exampleKcl'

 export const Settings = () => {
  const loaderData =
@ -97,10 +95,7 @@ export const Settings = () => {
      ONBOARDING_PROJECT_NAME,
      nextIndex
    )
-    const newFile = await createNewProject(
-      defaultDirectory + sep + name,
-      bracket
-    )
+    const newFile = await createNewProject(defaultDirectory + '/' + name)
    navigate(`${paths.FILE}/${encodeURIComponent(newFile.path)}`)
  }

@ -121,7 +116,7 @@ export const Settings = () => {
          Close
        </ActionButton>
      </AppHeader>
-      <div className="max-w-5xl mx-5 lg:mx-auto my-24">
+      <div className="max-w-5xl mx-auto my-24">
        <h1 className="text-4xl font-bold">User Settings</h1>
        <p className="max-w-2xl mt-6">
          Don't see the feature you want? Check to see if it's on{' '}
--- a/src/routes/SignIn.tsx
+++ b/src/routes/SignIn.tsx
@ -67,7 +67,6 @@ const SignIn = () => {
            onClick={signInTauri}
            icon={{ icon: faSignInAlt }}
            className="w-fit mt-4"
-            id="signin"
          >
            Sign in
          </ActionButton>
--- a/src/useStore.ts
+++ b/src/useStore.ts
@ -2,10 +2,12 @@ import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
 import { addLineHighlight, EditorView } from './editor/highlightextension'
 import { parse, Program, _executor, ProgramMemory } from './lang/wasm'
-import { Selection } from 'lib/selections'
+import { Selection, Selections, SelectionRangeTypeMap } from 'lib/selections'
 import { enginelessExecutor } from './lib/testHelpers'
+import { EditorSelection } from '@codemirror/state'
 import { EngineCommandManager } from './lang/std/engineConnection'
 import { KCLError } from './lang/errors'
+import { kclManager } from 'lang/KclSinglton'
 import { DefaultPlanes } from './wasm-lib/kcl/bindings/DefaultPlanes'

 export type ToolTip =
@ -253,13 +255,11 @@ export async function executeAst({
  engineCommandManager,
  defaultPlanes,
  useFakeExecutor = false,
-  programMemoryOverride,
 }: {
  ast: Program
  engineCommandManager: EngineCommandManager
  defaultPlanes: DefaultPlanes
  useFakeExecutor?: boolean
-  programMemoryOverride?: ProgramMemory
 }): Promise<{
  logs: string[]
  errors: KCLError[]
@ -271,13 +271,10 @@ export async function executeAst({
      engineCommandManager.startNewSession()
    }
    const programMemory = await (useFakeExecutor
-      ? enginelessExecutor(
-          ast,
-          programMemoryOverride || {
-            root: defaultProgramMemory,
-            return: null,
-          }
-        )
+      ? enginelessExecutor(ast, {
+          root: defaultProgramMemory,
+          return: null,
+        })
      : _executor(
          ast,
          {
--- a/src/wasm-lib/.config/nextest.toml
+++ b/src/wasm-lib/.config/nextest.toml
@ -6,10 +6,10 @@
 serial-integration = { max-threads = 4 }

 [profile.default]
-slow-timeout = { period = "10s", terminate-after = 1 }
+slow-timeout = { period = "60s", terminate-after = 1 }

 [profile.ci]
-slow-timeout = { period = "30s", terminate-after = 5 }
+slow-timeout = { period = "120s", terminate-after = 10 }

 [[profile.default.overrides]]
 filter = "test(serial_test_)"
@ -20,7 +20,3 @@ threads-required = 4
 filter = "test(serial_test_)"
 test-group = "serial-integration"
 threads-required = 4
-
-[[profile.default.overrides]]
-filter = "test(parser::parser_impl::snapshot_tests)"
-slow-timeout = { period = "1s", terminate-after = 5 }
--- a/src/wasm-lib/Cargo.lock
+++ b/src/wasm-lib/Cargo.lock
--- a/src/wasm-lib/Cargo.toml
+++ b/src/wasm-lib/Cargo.toml
@ -2,8 +2,6 @@
 name = "wasm-lib"
 version = "0.1.0"
 edition = "2021"
-repository = "https://github.com/KittyCAD/modeling-app"
-rust-version = "1.73"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
@ -13,31 +11,31 @@ crate-type = ["cdylib"]
 bson = { version = "2.7.0", features = ["uuid-1", "chrono"] }
 gloo-utils = "0.2.0"
 kcl-lib = { path = "kcl" }
-kittycad = { workspace = true }
-serde_json = "1.0.108"
-uuid = { version = "1.6.0", features = ["v4", "js", "serde"] }
-wasm-bindgen = "0.2.88"
-wasm-bindgen-futures = "0.4.38"
+kittycad = { version = "0.2.33", default-features = false, features = ["js"] }
+serde_json = "1.0.107"
+uuid = { version = "1.4.1", features = ["v4", "js", "serde"] }
+wasm-bindgen = "0.2.87"
+wasm-bindgen-futures = "0.4.37"

 [dev-dependencies]
 anyhow = "1"
 image = "0.24.7"
-kittycad = { workspace = true, default-features = true }
+kittycad = "0.2.33"
 pretty_assertions = "1.4.0"
 reqwest = { version = "0.11.22", default-features = false }
-tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.33.0", features = ["rt-multi-thread", "macros", "time"] }
 twenty-twenty = "0.6.1"
-uuid = { version = "1.6.0", features = ["v4", "js", "serde"] }
+uuid = { version = "1.4.1", features = ["v4", "js", "serde"] }

 [target.'cfg(target_arch = "wasm32")'.dependencies]
-futures = "0.3.29"
-js-sys = "0.3.65"
+futures = "0.3.28"
+js-sys = "0.3.64"
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
 wasm-bindgen-futures = { version = "0.4.37", features = ["futures-core-03-stream"] }
-wasm-streams = "0.4.0"
+wasm-streams = "0.3.0"

 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
-version = "0.3.65"
+version = "0.3.57"
 features = [
  "console",
  "HtmlTextAreaElement",
@ -53,12 +51,8 @@ debug = true
 members = [
 	"derive-docs",
 	"kcl",
-  "kcl-macros",
 ]

-[workspace.dependencies]
-kittycad = { version = "0.2.43", default-features = false, features = ["js"] }
-
 [[test]]
 name = "executor"
 path = "tests/executor/main.rs"
--- a/src/wasm-lib/derive-docs/Cargo.toml
+++ b/src/wasm-lib/derive-docs/Cargo.toml
@ -4,8 +4,6 @@ description = "A tool for generating documentation from Rust derive macros"
 version = "0.1.4"
 edition = "2021"
 license = "MIT"
-repository = "https://github.com/KittyCAD/modeling-app"
-rust-version = "1.73"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@ -16,9 +14,9 @@ proc-macro = true
 convert_case = "0.6.0"
 proc-macro2 = "1"
 quote = "1"
-serde = { version = "1.0.192", features = ["derive"] }
+serde = { version = "1.0.189", features = ["derive"] }
 serde_tokenstream = "0.2"
-syn = { version = "2.0.39", features = ["full"] }
+syn = { version = "2.0.38", features = ["full"] }

 [dev-dependencies]
 expectorate = "1.1.0"
--- a/src/wasm-lib/kcl-macros/Cargo.toml
+++ b/src/wasm-lib/kcl-macros/Cargo.toml
@ -1,22 +0,0 @@
-[package]
-name = "kcl-macros"
-description = "Macro for compiling KCL to its AST during Rust compile-time"
-version = "0.1.0"
-edition = "2021"
-license = "MIT"
-repository = "https://github.com/KittyCAD/modeling-app"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-proc-macro = true
-
-[dependencies]
-databake = "0.1.7"
-kcl-lib = { path = "../kcl" }
-proc-macro2 = "1"
-quote = "1"
-syn = { version = "2.0.39", features = ["full"] }
-
-[dev-dependencies]
-pretty_assertions = "1.4.0"
--- a/src/wasm-lib/kcl-macros/src/lib.rs
+++ b/src/wasm-lib/kcl-macros/src/lib.rs
@ -1,23 +0,0 @@
-//! This crate contains macros for parsing KCL at Rust compile-time.
-use databake::*;
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, LitStr};
-
-/// Parses KCL into its AST at compile-time.
-/// This macro takes exactly one argument: A string literal containing KCL.
-/// # Examples
-/// ```
-/// extern crate alloc;
-/// use kcl_compile_macro::parse_kcl;
-/// let ast: kcl_lib::ast::types::Program = parse_kcl!("const y = 4");
-/// ```
-#[proc_macro]
-pub fn parse(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as LitStr);
-    let kcl_src = input.value();
-    let tokens = kcl_lib::token::lexer(&kcl_src);
-    let ast = kcl_lib::parser::Parser::new(tokens).ast().unwrap();
-    let ast_struct = ast.bake(&Default::default());
-    quote!(#ast_struct).into()
-}
--- a/src/wasm-lib/kcl-macros/tests/macro_test.rs
+++ b/src/wasm-lib/kcl-macros/tests/macro_test.rs
@ -1,38 +0,0 @@
-extern crate alloc;
-use kcl_lib::ast::types::{
-    BodyItem, Identifier, Literal, LiteralValue, NonCodeMeta, Program, Value, VariableDeclaration, VariableDeclarator,
-    VariableKind,
-};
-use kcl_macros::parse;
-use pretty_assertions::assert_eq;
-
-#[test]
-fn basic() {
-    let actual = parse!("const y = 4");
-    let expected = Program {
-        start: 0,
-        end: 11,
-        body: vec![BodyItem::VariableDeclaration(VariableDeclaration {
-            start: 0,
-            end: 11,
-            declarations: vec![VariableDeclarator {
-                start: 6,
-                end: 11,
-                id: Identifier {
-                    start: 6,
-                    end: 7,
-                    name: "y".to_owned(),
-                },
-                init: Value::Literal(Box::new(Literal {
-                    start: 10,
-                    end: 11,
-                    value: LiteralValue::IInteger(4),
-                    raw: "4".to_owned(),
-                })),
-            }],
-            kind: VariableKind::Const,
-        })],
-        non_code_meta: NonCodeMeta::default(),
-    };
-    assert_eq!(expected, actual);
-}
--- a/src/wasm-lib/kcl/Cargo.toml
+++ b/src/wasm-lib/kcl/Cargo.toml
@ -1,13 +1,9 @@
 [package]
 name = "kcl-lib"
-description = "KittyCAD Language implementation and tools"
-version = "0.1.37"
+description = "KittyCAD Language"
+version = "0.1.35"
 edition = "2021"
 license = "MIT"
-repository = "https://github.com/KittyCAD/modeling-app"
-rust-version = "1.73"
-authors = ["Jess Frazelle", "Adam Chalmers", "KittyCAD, Inc"]
-keywords = ["kcl", "KittyCAD", "CAD"]

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

@ -15,34 +11,33 @@ keywords = ["kcl", "KittyCAD", "CAD"]
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 async-recursion = "1.0.5"
 async-trait = "0.1.73"
-clap = { version = "4.4.8", features = ["cargo", "derive", "env", "unicode"], optional = true }
+clap = { version = "4.4.6", features = ["cargo", "derive", "env", "unicode"], optional = true }
 dashmap = "5.5.3"
-databake = { version = "0.1.7", features = ["derive"] }
 derive-docs = { version = "0.1.4" }
 #derive-docs = { path = "../derive-docs" }
-kittycad = { workspace = true }
+kittycad = { version = "0.2.33", default-features = false, features = ["js"] }
 lazy_static = "1.4.0"
 parse-display = "0.8.2"
-schemars = { version = "0.8.16", features = ["impl_json_schema", "url", "uuid1"] }
-serde = { version = "1.0.192", features = ["derive"] }
-serde_json = "1.0.108"
-thiserror = "1.0.50"
+schemars = { version = "0.8", features = ["impl_json_schema", "url", "uuid1"] }
+serde = { version = "1.0.189", features = ["derive"] }
+serde_json = "1.0.107"
+thiserror = "1.0.49"
 ts-rs = { version = "7", package = "ts-rs-json-value", features = ["serde-json-impl", "schemars-impl", "uuid-impl"] }
-uuid = { version = "1.6.0", features = ["v4", "js", "serde"] }
-winnow = "0.5.18"
+uuid = { version = "1.4.1", features = ["v4", "js", "serde"] }
+winnow = "0.5.16"

 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = { version = "0.3.65" }
+js-sys = { version = "0.3.64" }
 tower-lsp = { version = "0.20.0", default-features = false, features = ["runtime-agnostic"] }
-wasm-bindgen = "0.2.88"
-wasm-bindgen-futures = "0.4.38"
-web-sys = { version = "0.3.65", features = ["console"] }
+wasm-bindgen = "0.2.87"
+wasm-bindgen-futures = "0.4.37"
+web-sys = { version = "0.3.64", features = ["console"] }

 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 bson = { version = "2.7.0", features = ["uuid-1", "chrono"] }
-futures = { version = "0.3.29" }
+futures = { version = "0.3.28" }
 reqwest = { version = "0.11.22", default-features = false }
-tokio = { version = "1.34.0", features = ["full"] }
+tokio = { version = "1.33.0", features = ["full"] }
 tokio-tungstenite = { version = "0.20.0", features = ["rustls-tls-native-roots"] }
 tower-lsp = { version = "0.20.0", features = ["proposed"] }

@ -55,16 +50,12 @@ engine = []
 panic = "abort"
 debug = true

-[profile.bench]
-debug = true # Flamegraphs of benchmarks require accurate debug symbols
-
 [dev-dependencies]
 criterion = "0.5.1"
 expectorate = "1.1.0"
-insta = { version = "1.34.0", features = ["json"] }
-itertools = "0.12.0"
+itertools = "0.11.0"
 pretty_assertions = "1.4.0"
-tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros", "time"] }
+tokio = { version = "1.33.0", features = ["rt-multi-thread", "macros", "time"] }

 [[bench]]
 name = "compiler_benchmark"
--- a/src/wasm-lib/kcl/benches/compiler_benchmark.rs
+++ b/src/wasm-lib/kcl/benches/compiler_benchmark.rs
@ -11,7 +11,6 @@ pub fn bench_parse(c: &mut Criterion) {
        ("pipes_on_pipes", PIPES_PROGRAM),
        ("big_kitt", KITT_PROGRAM),
        ("cube", CUBE_PROGRAM),
-        ("math", MATH_PROGRAM),
    ] {
        let tokens = kcl_lib::token::lexer(file);
        c.bench_function(&format!("parse_{name}"), move |b| {
@ -34,4 +33,3 @@ criterion_main!(benches);
 const KITT_PROGRAM: &str = include_str!("../../tests/executor/inputs/kittycad_svg.kcl");
 const PIPES_PROGRAM: &str = include_str!("../../tests/executor/inputs/pipes_on_pipes.kcl");
 const CUBE_PROGRAM: &str = include_str!("../../tests/executor/inputs/cube.kcl");
-const MATH_PROGRAM: &str = include_str!("../../tests/executor/inputs/math.kcl");
--- a/src/wasm-lib/kcl/fuzz/Cargo.toml
+++ b/src/wasm-lib/kcl/fuzz/Cargo.toml
@ -3,8 +3,6 @@ name = "kcl-lib-fuzz"
 version = "0.0.0"
 publish = false
 edition = "2021"
-repository = "https://github.com/KittyCAD/modeling-app"
-rust-version = "1.73"

 [package.metadata]
 cargo-fuzz = true
--- a/src/wasm-lib/kcl/src/ast/modify.rs
+++ b/src/wasm-lib/kcl/src/ast/modify.rs
@ -136,7 +136,7 @@ pub async fn modify_ast_for_sketch(
    })?;

    let mut additional_lines = Vec::new();
-    let mut last_point = first_control_points.points[1];
+    let mut last_point = first_control_points.points[1].clone();
    for control_point in control_points[1..].iter() {
        additional_lines.push([
            (control_point.points[1].x - last_point.x),
--- a/src/wasm-lib/kcl/src/ast/types.rs
+++ b/src/wasm-lib/kcl/src/ast/types.rs
@ -3,26 +3,19 @@
 use std::{collections::HashMap, fmt::Write};

 use anyhow::Result;
-use databake::*;
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value as JValue};
+use serde_json::Map;
 use tower_lsp::lsp_types::{CompletionItem, CompletionItemKind, DocumentSymbol, Range as LspRange, SymbolKind};

-pub use self::literal_value::LiteralValue;
 use crate::{
-    docs::StdLibFn,
    errors::{KclError, KclErrorDetails},
-    executor::{BodyType, ExecutorContext, MemoryItem, Metadata, PipeInfo, ProgramMemory, SourceRange, UserVal},
+    executor::{ExecutorContext, MemoryItem, Metadata, PipeInfo, ProgramMemory, SourceRange, UserVal},
    parser::PIPE_OPERATOR,
-    std::{kcl_stdlib::KclStdLibFn, FunctionKind},
 };

-mod literal_value;
-
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct Program {
@ -221,11 +214,11 @@ impl Program {
            if let Some(Value::FunctionExpression(ref mut function_expression)) = &mut value {
                // Check if the params to the function expression contain the position.
                for param in &mut function_expression.params {
-                    let param_source_range: SourceRange = (&param.identifier).into();
+                    let param_source_range: SourceRange = param.clone().into();
                    if param_source_range.contains(pos) {
-                        let old_name = param.identifier.name.clone();
+                        let old_name = param.name.clone();
                        // Rename the param.
-                        param.identifier.rename(&old_name, new_name);
+                        param.rename(&old_name, new_name);
                        // Now rename all the identifiers in the rest of the program.
                        function_expression.body.rename_identifiers(&old_name, new_name);
                        return;
@ -351,8 +344,7 @@ macro_rules! impl_value_meta {

 pub(crate) use impl_value_meta;

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum BodyItem {
@ -379,20 +371,19 @@ impl BodyItem {
    }
 }

-impl From<BodyItem> for SourceRange {
+impl From<BodyItem> for crate::executor::SourceRange {
    fn from(item: BodyItem) -> Self {
        Self([item.start(), item.end()])
    }
 }

-impl From<&BodyItem> for SourceRange {
+impl From<&BodyItem> for crate::executor::SourceRange {
    fn from(item: &BodyItem) -> Self {
        Self([item.start(), item.end()])
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum Value {
@ -543,20 +534,19 @@ impl Value {
    }
 }

-impl From<Value> for SourceRange {
+impl From<Value> for crate::executor::SourceRange {
    fn from(value: Value) -> Self {
        Self([value.start(), value.end()])
    }
 }

-impl From<&Value> for SourceRange {
+impl From<&Value> for crate::executor::SourceRange {
    fn from(value: &Value) -> Self {
        Self([value.start(), value.end()])
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum BinaryPart {
@ -568,13 +558,13 @@ pub enum BinaryPart {
    MemberExpression(Box<MemberExpression>),
 }

-impl From<BinaryPart> for SourceRange {
+impl From<BinaryPart> for crate::executor::SourceRange {
    fn from(value: BinaryPart) -> Self {
        Self([value.start(), value.end()])
    }
 }

-impl From<&BinaryPart> for SourceRange {
+impl From<&BinaryPart> for crate::executor::SourceRange {
    fn from(value: &BinaryPart) -> Self {
        Self([value.start(), value.end()])
    }
@ -650,7 +640,7 @@ impl BinaryPart {
        pipe_info: &mut PipeInfo,
        ctx: &ExecutorContext,
    ) -> Result<MemoryItem, KclError> {
-        // We DO NOT set this globally because if we did and this was called inside a pipe it would
+        // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
        // stop the execution of the pipe.
        // THIS IS IMPORTANT.
        let mut new_pipe_info = pipe_info.clone();
@ -712,8 +702,7 @@ impl BinaryPart {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct NonCodeNode {
@ -761,8 +750,7 @@ impl NonCodeNode {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub enum CommentStyle {
@ -772,8 +760,7 @@ pub enum CommentStyle {
    Block,
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type", rename_all = "camelCase")]
 pub enum NonCodeValue {
@ -793,7 +780,7 @@ pub enum NonCodeValue {
    /// 1 + 1
    /// ```
    /// Now this is important. The block comment is attached to the next line.
-    /// This is always the case. Also the block comment doesn't have a new line above it.
+    /// This is always the case. Also the block comment doesnt have a new line above it.
    /// If it did it would be a `NewLineBlockComment`.
    BlockComment {
        value: String,
@ -810,8 +797,7 @@ pub enum NonCodeValue {
    NewLine,
 }

-#[derive(Debug, Default, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Default, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub struct NonCodeMeta {
@ -852,8 +838,7 @@ impl NonCodeMeta {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct ExpressionStatement {
@ -864,8 +849,7 @@ pub struct ExpressionStatement {

 impl_value_meta!(ExpressionStatement);

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct CallExpression {
@ -874,6 +858,7 @@ pub struct CallExpression {
    pub callee: Identifier,
    pub arguments: Vec<Value>,
    pub optional: bool,
+    pub function: Function,
 }

 impl_value_meta!(CallExpression);
@ -886,12 +871,22 @@ impl From<CallExpression> for Value {

 impl CallExpression {
    pub fn new(name: &str, arguments: Vec<Value>) -> Result<Self, KclError> {
+        // Create our stdlib.
+        let stdlib = crate::std::StdLib::new();
+        let func = stdlib.get(name).ok_or_else(|| {
+            KclError::UndefinedValue(KclErrorDetails {
+                message: format!("Function {} is not defined", name),
+                source_ranges: vec![],
+            })
+        })?;
+
        Ok(Self {
            start: 0,
            end: 0,
            callee: Identifier::new(name),
            arguments,
            optional: false,
+            function: Function::StdLib { func },
        })
    }

@ -935,7 +930,7 @@ impl CallExpression {
                    binary_expression.get_result(memory, pipe_info, ctx).await?
                }
                Value::CallExpression(call_expression) => {
-                    // We DO NOT set this globally because if we did and this was called inside a pipe it would
+                    // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
                    // stop the execution of the pipe.
                    // THIS IS IMPORTANT.
                    let mut new_pipe_info = pipe_info.clone();
@ -973,8 +968,8 @@ impl CallExpression {
            fn_args.push(result);
        }

-        match ctx.stdlib.get_either(&self.callee.name) {
-            FunctionKind::Core(func) => {
+        match &self.function {
+            Function::StdLib { func } => {
                // Attempt to call the function.
                let args = crate::std::Args::new(fn_args, self.into(), ctx.clone());
                let result = func.std_lib_fn()(args).await?;
@ -986,58 +981,14 @@ impl CallExpression {
                    Ok(result)
                }
            }
-            FunctionKind::Std(func) => {
-                let function_expression = func.function();
-                if fn_args.len() != function_expression.params.len() {
-                    return Err(KclError::Semantic(KclErrorDetails {
-                        message: format!(
-                            "Expected {} arguments, got {}",
-                            function_expression.params.len(),
-                            fn_args.len(),
-                        ),
-                        source_ranges: vec![(function_expression).into()],
-                    }));
-                }
-
-                // Add the arguments to the memory.
-                let mut fn_memory = memory.clone();
-                for (index, param) in function_expression.params.iter().enumerate() {
-                    fn_memory.add(
-                        &param.identifier.name,
-                        fn_args.get(index).unwrap().clone(),
-                        param.identifier.clone().into(),
-                    )?;
-                }
-
-                // Call the stdlib function
-                let p = func.function().clone().body;
-                let results = crate::executor::execute(p, &mut fn_memory, BodyType::Block, ctx).await?;
-                let out = results.return_;
-                let result = out.ok_or_else(|| {
-                    KclError::UndefinedValue(KclErrorDetails {
-                        message: format!("Result of stdlib function {} is undefined", fn_name),
-                        source_ranges: vec![self.into()],
-                    })
-                })?;
-                let result = result.get_value()?;
-
-                if pipe_info.is_in_pipe {
-                    pipe_info.index += 1;
-                    pipe_info.previous_results.push(result);
-
-                    execute_pipe_body(memory, &pipe_info.body.clone(), pipe_info, self.into(), ctx).await
-                } else {
-                    Ok(result)
-                }
-            }
-            FunctionKind::UserDefined => {
+            Function::InMemory => {
                let func = memory.get(&fn_name, self.into())?;
                let result = func
                    .call_fn(fn_args, memory.clone(), ctx.clone())
                    .await?
                    .ok_or_else(|| {
                        KclError::UndefinedValue(KclErrorDetails {
-                            message: format!("Result of user-defined function {} is undefined", fn_name),
+                            message: format!("Result of function {} is undefined", fn_name),
                            source_ranges: vec![self.into()],
                        })
                    })?;
@ -1112,15 +1063,10 @@ impl CallExpression {
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum Function {
-    /// A stdlib function written in Rust (aka core lib).
+    /// A stdlib function.
    StdLib {
        /// The function.
-        func: Box<dyn StdLibFn>,
-    },
-    /// A stdlib function written in KCL.
-    StdLibKcl {
-        /// The function.
-        func: Box<dyn KclStdLibFn>,
+        func: Box<dyn crate::docs::StdLibFn>,
    },
    /// A function that is defined in memory.
    #[default]
@ -1137,8 +1083,7 @@ impl PartialEq for Function {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct VariableDeclaration {
@ -1241,10 +1186,10 @@ impl VariableDeclaration {
                    symbol_kind = SymbolKind::FUNCTION;
                    let mut children = vec![];
                    for param in &function_expression.params {
-                        let param_source_range: SourceRange = (&param.identifier).into();
+                        let param_source_range: SourceRange = param.into();
                        #[allow(deprecated)]
                        children.push(DocumentSymbol {
-                            name: param.identifier.name.clone(),
+                            name: param.name.clone(),
                            detail: None,
                            kind: SymbolKind::VARIABLE,
                            range: param_source_range.to_lsp_range(code),
@ -1288,8 +1233,7 @@ impl VariableDeclaration {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display)]
 #[ts(export)]
 #[serde(rename_all = "snake_case")]
 #[display(style = "snake_case")]
@ -1333,8 +1277,7 @@ impl VariableKind {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct VariableDeclarator {
@ -1363,25 +1306,30 @@ impl VariableDeclarator {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct Literal {
    pub start: usize,
    pub end: usize,
-    pub value: LiteralValue,
+    pub value: serde_json::Value,
    pub raw: String,
 }

 impl_value_meta!(Literal);

+impl From<Literal> for Value {
+    fn from(literal: Literal) -> Self {
+        Value::Literal(Box::new(literal))
+    }
+}
+
 impl Literal {
-    pub fn new(value: LiteralValue) -> Self {
+    pub fn new(value: serde_json::Value) -> Self {
        Self {
            start: 0,
            end: 0,
-            raw: JValue::from(value.clone()).to_string(),
+            raw: value.to_string(),
            value,
        }
    }
@ -1395,19 +1343,11 @@ impl Literal {
    }

    fn recast(&self) -> String {
-        match self.value {
-            LiteralValue::Fractional(x) => {
-                if x.fract() == 0.0 {
-                    format!("{x:?}")
-                } else {
-                    self.raw.clone()
-                }
-            }
-            LiteralValue::IInteger(_) => self.raw.clone(),
-            LiteralValue::String(ref s) => {
-                let quote = if self.raw.trim().starts_with('"') { '"' } else { '\'' };
-                format!("{quote}{s}{quote}")
-            }
+        if let serde_json::Value::String(value) = &self.value {
+            let quote = if self.raw.trim().starts_with('"') { '"' } else { '\'' };
+            format!("{}{}{}", quote, value, quote)
+        } else {
+            self.value.to_string()
        }
    }
 }
@ -1415,7 +1355,7 @@ impl Literal {
 impl From<Literal> for MemoryItem {
    fn from(literal: Literal) -> Self {
        MemoryItem::UserVal(UserVal {
-            value: JValue::from(literal.value.clone()),
+            value: literal.value.clone(),
            meta: vec![Metadata {
                source_range: literal.into(),
            }],
@ -1426,7 +1366,7 @@ impl From<Literal> for MemoryItem {
 impl From<&Box<Literal>> for MemoryItem {
    fn from(literal: &Box<Literal>) -> Self {
        MemoryItem::UserVal(UserVal {
-            value: JValue::from(literal.value.clone()),
+            value: literal.value.clone(),
            meta: vec![Metadata {
                source_range: literal.into(),
            }],
@ -1434,8 +1374,7 @@ impl From<&Box<Literal>> for MemoryItem {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake, Eq)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct Identifier {
@ -1471,8 +1410,7 @@ impl Identifier {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct PipeSubstitution {
@ -1500,8 +1438,7 @@ impl From<PipeSubstitution> for Value {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct ArrayExpression {
@ -1615,7 +1552,7 @@ impl ArrayExpression {
                    binary_expression.get_result(memory, pipe_info, ctx).await?
                }
                Value::CallExpression(call_expression) => {
-                    // We DO NOT set this globally because if we did and this was called inside a pipe it would
+                    // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
                    // stop the execution of the pipe.
                    // THIS IS IMPORTANT.
                    let mut new_pipe_info = pipe_info.clone();
@ -1661,8 +1598,7 @@ impl ArrayExpression {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct ObjectExpression {
@ -1767,7 +1703,7 @@ impl ObjectExpression {
                    binary_expression.get_result(memory, pipe_info, ctx).await?
                }
                Value::CallExpression(call_expression) => {
-                    // We DO NOT set this globally because if we did and this was called inside a pipe it would
+                    // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
                    // stop the execution of the pipe.
                    // THIS IS IMPORTANT.
                    let mut new_pipe_info = pipe_info.clone();
@ -1819,8 +1755,7 @@ impl ObjectExpression {

 impl_value_meta!(ObjectExpression);

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct ObjectProperty {
@ -1862,8 +1797,7 @@ impl ObjectProperty {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum MemberObject {
@ -1897,20 +1831,19 @@ impl MemberObject {
    }
 }

-impl From<MemberObject> for SourceRange {
+impl From<MemberObject> for crate::executor::SourceRange {
    fn from(obj: MemberObject) -> Self {
        Self([obj.start(), obj.end()])
    }
 }

-impl From<&MemberObject> for SourceRange {
+impl From<&MemberObject> for crate::executor::SourceRange {
    fn from(obj: &MemberObject) -> Self {
        Self([obj.start(), obj.end()])
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub enum LiteralIdentifier {
@ -1934,20 +1867,19 @@ impl LiteralIdentifier {
    }
 }

-impl From<LiteralIdentifier> for SourceRange {
+impl From<LiteralIdentifier> for crate::executor::SourceRange {
    fn from(id: LiteralIdentifier) -> Self {
        Self([id.start(), id.end()])
    }
 }

-impl From<&LiteralIdentifier> for SourceRange {
+impl From<&LiteralIdentifier> for crate::executor::SourceRange {
    fn from(id: &LiteralIdentifier) -> Self {
        Self([id.start(), id.end()])
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct MemberExpression {
@ -2035,21 +1967,17 @@ impl MemberExpression {
            LiteralIdentifier::Identifier(identifier) => identifier.name.to_string(),
            LiteralIdentifier::Literal(literal) => {
                let value = literal.value.clone();
-                match value {
-                    LiteralValue::IInteger(x) if x >= 0 => return self.get_result_array(memory, x as usize),
-                    LiteralValue::IInteger(x) => {
-                        return Err(KclError::Syntax(KclErrorDetails {
-                            source_ranges: vec![self.into()],
-                            message: format!("invalid index: {x}"),
-                        }))
-                    }
-                    LiteralValue::Fractional(x) => {
-                        return Err(KclError::Syntax(KclErrorDetails {
-                            source_ranges: vec![self.into()],
-                            message: format!("invalid index: {x}"),
-                        }))
-                    }
-                    LiteralValue::String(s) => s,
+                // Parse this as a string.
+                if let serde_json::Value::String(string) = value {
+                    string
+                } else if let serde_json::Value::Number(_) = &value {
+                    // It can also be a number if we are getting a member of an array.
+                    return self.get_result_array(memory, parse_json_number_as_usize(&value, self.into())?);
+                } else {
+                    return Err(KclError::Semantic(KclErrorDetails {
+                        message: format!("Expected string literal or number for property name, found {:?}", value),
+                        source_ranges: vec![literal.into()],
+                    }));
                }
            }
        };
@ -2110,8 +2038,7 @@ pub struct ObjectKeyInfo {
    pub computed: bool,
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct BinaryExpression {
@ -2206,7 +2133,7 @@ impl BinaryExpression {
        pipe_info: &mut PipeInfo,
        ctx: &ExecutorContext,
    ) -> Result<MemoryItem, KclError> {
-        // We DO NOT set this globally because if we did and this was called inside a pipe it would
+        // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
        // stop the execution of the pipe.
        // THIS IS IMPORTANT.
        let mut new_pipe_info = pipe_info.clone();
@ -2248,7 +2175,6 @@ impl BinaryExpression {
            BinaryOperator::Mul => (left * right).into(),
            BinaryOperator::Div => (left / right).into(),
            BinaryOperator::Mod => (left % right).into(),
-            BinaryOperator::Pow => (left.powf(right)).into(),
        };

        Ok(MemoryItem::UserVal(UserVal {
@ -2282,6 +2208,22 @@ pub fn parse_json_number_as_f64(j: &serde_json::Value, source_range: SourceRange
    }
 }

+pub fn parse_json_number_as_usize(j: &serde_json::Value, source_range: SourceRange) -> Result<usize, KclError> {
+    if let serde_json::Value::Number(n) = &j {
+        Ok(n.as_i64().ok_or_else(|| {
+            KclError::Syntax(KclErrorDetails {
+                source_ranges: vec![source_range],
+                message: format!("Invalid index: {}", j),
+            })
+        })? as usize)
+    } else {
+        Err(KclError::Syntax(KclErrorDetails {
+            source_ranges: vec![source_range],
+            message: format!("Invalid index: {}", j),
+        }))
+    }
+}
+
 pub fn parse_json_value_as_string(j: &serde_json::Value) -> Option<String> {
    if let serde_json::Value::String(n) = &j {
        Some(n.clone())
@ -2290,8 +2232,7 @@ pub fn parse_json_value_as_string(j: &serde_json::Value) -> Option<String> {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display)]
 #[ts(export)]
 #[serde(rename_all = "snake_case")]
 #[display(style = "snake_case")]
@ -2316,51 +2257,17 @@ pub enum BinaryOperator {
    #[serde(rename = "%")]
    #[display("%")]
    Mod,
-    /// Raise a number to a power.
-    #[serde(rename = "^")]
-    #[display("^")]
-    Pow,
-}
-
-/// Mathematical associativity.
-/// Should a . b . c be read as (a . b) . c, or a . (b . c)
-/// See <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_precedence#precedence_and_associativity> for more.
-#[derive(PartialEq, Eq, Debug, Clone, Copy)]
-pub enum Associativity {
-    /// Read a . b . c as (a . b) . c
-    Left,
-    /// Read a . b . c as a . (b . c)
-    Right,
-}
-
-impl Associativity {
-    pub fn is_left(&self) -> bool {
-        matches!(self, Self::Left)
-    }
 }

 impl BinaryOperator {
-    /// Follow JS definitions of each operator.
-    /// Taken from <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_precedence#table>
    pub fn precedence(&self) -> u8 {
        match &self {
            BinaryOperator::Add | BinaryOperator::Sub => 11,
            BinaryOperator::Mul | BinaryOperator::Div | BinaryOperator::Mod => 12,
-            BinaryOperator::Pow => 6,
-        }
-    }
-
-    /// Follow JS definitions of each operator.
-    /// Taken from <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Operator_precedence#table>
-    pub fn associativity(&self) -> Associativity {
-        match self {
-            Self::Add | Self::Sub | Self::Mul | Self::Div | Self::Mod => Associativity::Left,
-            Self::Pow => Associativity::Right,
        }
    }
 }
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct UnaryExpression {
@ -2400,7 +2307,7 @@ impl UnaryExpression {
        pipe_info: &mut PipeInfo,
        ctx: &ExecutorContext,
    ) -> Result<MemoryItem, KclError> {
-        // We DO NOT set this globally because if we did and this was called inside a pipe it would
+        // We DO NOT set this gloablly because if we did and this was called inside a pipe it would
        // stop the execution of the pipe.
        // THIS IS IMPORTANT.
        let mut new_pipe_info = pipe_info.clone();
@ -2438,8 +2345,7 @@ impl UnaryExpression {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, FromStr, Display)]
 #[ts(export)]
 #[serde(rename_all = "snake_case")]
 #[display(style = "snake_case")]
@ -2454,8 +2360,7 @@ pub enum UnaryOperator {
    Not,
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(rename_all = "camelCase", tag = "type")]
 pub struct PipeExpression {
@ -2613,26 +2518,13 @@ async fn execute_pipe_body(
    }
 }

-/// Parameter of a KCL function.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
-#[ts(export)]
-#[serde(tag = "type")]
-pub struct Parameter {
-    /// The parameter's label or name.
-    pub identifier: Identifier,
-    /// Is the parameter optional?
-    pub optional: bool,
-}
-
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct FunctionExpression {
    pub start: usize,
    pub end: usize,
-    pub params: Vec<Parameter>,
+    pub params: Vec<Identifier>,
    pub body: Program,
 }

@ -2658,7 +2550,7 @@ impl FunctionExpression {
            "({}) => {{\n{}{}\n}}",
            self.params
                .iter()
-                .map(|param| param.identifier.name.clone())
+                .map(|param| param.name.clone())
                .collect::<Vec<String>>()
                .join(", "),
            options.get_indentation(indentation_level + 1),
@ -2676,8 +2568,7 @@ impl FunctionExpression {
    }
 }

-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
 pub struct ReturnStatement {
@ -3364,40 +3255,4 @@ const thickness = sqrt(distance * p * FOS * 6 / (sigmaAllow * width))"#;
        let recasted = program.recast(&Default::default(), 0);
        assert_eq!(recasted.trim(), some_program_string);
    }
-
-    #[test]
-    fn recast_literal() {
-        use winnow::Parser;
-        for (i, (raw, expected, reason)) in [
-            (
-                "5.0",
-                "5.0",
-                "fractional numbers should stay fractional, i.e. don't reformat this to '5'",
-            ),
-            (
-                "5",
-                "5",
-                "integers should stay integral, i.e. don't reformat this to '5.0'",
-            ),
-            (
-                "5.0000000",
-                "5.0",
-                "if the number is f64 but not fractional, use its canonical format",
-            ),
-            ("5.1", "5.1", "straightforward case works"),
-        ]
-        .into_iter()
-        .enumerate()
-        {
-            let tokens = crate::token::lexer(raw);
-            let literal = crate::parser::parser_impl::unsigned_number_literal
-                .parse(&tokens)
-                .unwrap();
-            assert_eq!(
-                literal.recast(),
-                expected,
-                "failed test {i}, which is testing that {reason}"
-            );
-        }
-    }
 }
--- a/src/wasm-lib/kcl/src/ast/types/literal_value.rs
+++ b/src/wasm-lib/kcl/src/ast/types/literal_value.rs
@ -1,72 +0,0 @@
-use databake::*;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use serde_json::Value as JValue;
-
-use super::{Literal, Value};
-
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
-#[databake(path = kcl_lib::ast::types)]
-#[ts(export)]
-#[serde(untagged, rename_all = "snake_case")]
-pub enum LiteralValue {
-    IInteger(i64),
-    Fractional(f64),
-    String(String),
-}
-
-impl From<Literal> for Value {
-    fn from(literal: Literal) -> Self {
-        Value::Literal(Box::new(literal))
-    }
-}
-
-impl From<LiteralValue> for JValue {
-    fn from(value: LiteralValue) -> Self {
-        match value {
-            LiteralValue::IInteger(x) => x.into(),
-            LiteralValue::Fractional(x) => x.into(),
-            LiteralValue::String(x) => x.into(),
-        }
-    }
-}
-
-impl From<f64> for LiteralValue {
-    fn from(value: f64) -> Self {
-        Self::Fractional(value)
-    }
-}
-
-impl From<i64> for LiteralValue {
-    fn from(value: i64) -> Self {
-        Self::IInteger(value)
-    }
-}
-
-impl From<String> for LiteralValue {
-    fn from(value: String) -> Self {
-        Self::String(value)
-    }
-}
-
-impl From<u32> for LiteralValue {
-    fn from(value: u32) -> Self {
-        Self::IInteger(value as i64)
-    }
-}
-impl From<u16> for LiteralValue {
-    fn from(value: u16) -> Self {
-        Self::IInteger(value as i64)
-    }
-}
-impl From<u8> for LiteralValue {
-    fn from(value: u8) -> Self {
-        Self::IInteger(value as i64)
-    }
-}
-impl From<&'static str> for LiteralValue {
-    fn from(value: &'static str) -> Self {
-        // TODO: Make this Cow<str>
-        Self::String(value.to_owned())
-    }
-}
--- a/src/wasm-lib/kcl/src/docs.rs
+++ b/src/wasm-lib/kcl/src/docs.rs
@ -193,7 +193,7 @@ pub trait StdLibFn: std::fmt::Debug + Send + Sync {
    }

    fn to_signature_help(&self) -> SignatureHelp {
-        // Fill this in based on the current position of the cursor.
+        // Fill this in based on the current positon of the cursor.
        let active_parameter = None;

        SignatureHelp {
--- a/src/wasm-lib/kcl/src/engine/conn.rs
+++ b/src/wasm-lib/kcl/src/engine/conn.rs
@ -88,7 +88,11 @@ impl EngineConnection {
        let ws_stream = tokio_tungstenite::WebSocketStream::from_raw_socket(
            ws,
            tokio_tungstenite::tungstenite::protocol::Role::Client,
-            Some(tokio_tungstenite::tungstenite::protocol::WebSocketConfig { ..Default::default() }),
+            Some(tokio_tungstenite::tungstenite::protocol::WebSocketConfig {
+                write_buffer_size: 1024 * 128,
+                max_write_buffer_size: 1024 * 256,
+                ..Default::default()
+            }),
        )
        .await;

--- a/src/wasm-lib/kcl/src/errors.rs
+++ b/src/wasm-lib/kcl/src/errors.rs
@ -8,8 +8,6 @@ use crate::executor::SourceRange;
 #[ts(export)]
 #[serde(tag = "kind", rename_all = "snake_case")]
 pub enum KclError {
-    #[error("lexical: {0:?}")]
-    Lexical(KclErrorDetails),
    #[error("syntax: {0:?}")]
    Syntax(KclErrorDetails),
    #[error("semantic: {0:?}")]
@ -28,8 +26,6 @@ pub enum KclError {
    InvalidExpression(KclErrorDetails),
    #[error("engine: {0:?}")]
    Engine(KclErrorDetails),
-    #[error("internal error, please report to KittyCAD team: {0:?}")]
-    Internal(KclErrorDetails),
 }

 #[derive(Debug, Serialize, Deserialize, ts_rs::TS, Clone)]
@ -44,8 +40,20 @@ pub struct KclErrorDetails {
 impl KclError {
    /// Get the error message, line and column from the error and input code.
    pub fn get_message_line_column(&self, input: &str) -> (String, Option<usize>, Option<usize>) {
+        let (type_, source_range, message) = match &self {
+            KclError::Syntax(e) => ("syntax", e.source_ranges.clone(), e.message.clone()),
+            KclError::Semantic(e) => ("semantic", e.source_ranges.clone(), e.message.clone()),
+            KclError::Type(e) => ("type", e.source_ranges.clone(), e.message.clone()),
+            KclError::Unimplemented(e) => ("unimplemented", e.source_ranges.clone(), e.message.clone()),
+            KclError::Unexpected(e) => ("unexpected", e.source_ranges.clone(), e.message.clone()),
+            KclError::ValueAlreadyDefined(e) => ("value already defined", e.source_ranges.clone(), e.message.clone()),
+            KclError::UndefinedValue(e) => ("undefined value", e.source_ranges.clone(), e.message.clone()),
+            KclError::InvalidExpression(e) => ("invalid expression", e.source_ranges.clone(), e.message.clone()),
+            KclError::Engine(e) => ("engine", e.source_ranges.clone(), e.message.clone()),
+        };
+
        // Calculate the line and column of the error from the source range.
-        let (line, column) = if let Some(range) = self.source_ranges().first() {
+        let (line, column) = if let Some(range) = source_range.first() {
            let line = input[..range.0[0]].lines().count();
            let column = input[..range.0[0]].lines().last().map(|l| l.len()).unwrap_or_default();

@ -54,28 +62,11 @@ impl KclError {
            (None, None)
        };

-        (format!("{}: {}", self.error_type(), self.message()), line, column)
-    }
-
-    pub fn error_type(&self) -> &'static str {
-        match self {
-            KclError::Lexical(_) => "lexical",
-            KclError::Syntax(_) => "syntax",
-            KclError::Semantic(_) => "semantic",
-            KclError::Type(_) => "type",
-            KclError::Unimplemented(_) => "unimplemented",
-            KclError::Unexpected(_) => "unexpected",
-            KclError::ValueAlreadyDefined(_) => "value already defined",
-            KclError::UndefinedValue(_) => "undefined value",
-            KclError::InvalidExpression(_) => "invalid expression",
-            KclError::Engine(_) => "engine",
-            KclError::Internal(_) => "internal",
-        }
+        (format!("{}: {}", type_, message), line, column)
    }

    pub fn source_ranges(&self) -> Vec<SourceRange> {
        match &self {
-            KclError::Lexical(e) => e.source_ranges.clone(),
            KclError::Syntax(e) => e.source_ranges.clone(),
            KclError::Semantic(e) => e.source_ranges.clone(),
            KclError::Type(e) => e.source_ranges.clone(),
@ -85,14 +76,12 @@ impl KclError {
            KclError::UndefinedValue(e) => e.source_ranges.clone(),
            KclError::InvalidExpression(e) => e.source_ranges.clone(),
            KclError::Engine(e) => e.source_ranges.clone(),
-            KclError::Internal(e) => e.source_ranges.clone(),
        }
    }

    /// Get the inner error message.
    pub fn message(&self) -> &str {
        match &self {
-            KclError::Lexical(e) => &e.message,
            KclError::Syntax(e) => &e.message,
            KclError::Semantic(e) => &e.message,
            KclError::Type(e) => &e.message,
@ -102,7 +91,6 @@ impl KclError {
            KclError::UndefinedValue(e) => &e.message,
            KclError::InvalidExpression(e) => &e.message,
            KclError::Engine(e) => &e.message,
-            KclError::Internal(e) => &e.message,
        }
    }

--- a/src/wasm-lib/kcl/src/executor.rs
+++ b/src/wasm-lib/kcl/src/executor.rs
@ -1,9 +1,8 @@
 //! The executor for the AST.

-use std::{collections::HashMap, sync::Arc};
+use std::collections::HashMap;

 use anyhow::Result;
-use async_recursion::async_recursion;
 use kittycad::types::{Color, ModelingCmd, Point3D};
 use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
@ -11,10 +10,9 @@ use serde::{Deserialize, Serialize};
 use tower_lsp::lsp_types::{Position as LspPosition, Range as LspRange};

 use crate::{
-    ast::types::{BodyItem, FunctionExpression, Value},
+    ast::types::{BodyItem, Function, FunctionExpression, Value},
    engine::{EngineConnection, EngineManager},
    errors::{KclError, KclErrorDetails},
-    std::{FunctionKind, StdLib},
 };

 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
@ -185,7 +183,7 @@ impl DefaultPlanes {
                SourceRange::default(),
                ModelingCmd::MakePlane {
                    clobber: false,
-                    origin: default_origin,
+                    origin: default_origin.clone(),
                    size: default_size,
                    x_axis: Point3D { x: 1.0, y: 0.0, z: 0.0 },
                    y_axis: Point3D { x: 0.0, y: 1.0, z: 0.0 },
@ -218,7 +216,7 @@ impl DefaultPlanes {
                SourceRange::default(),
                ModelingCmd::MakePlane {
                    clobber: false,
-                    origin: default_origin,
+                    origin: default_origin.clone(),
                    size: default_size,
                    x_axis: Point3D { x: 0.0, y: 1.0, z: 0.0 },
                    y_axis: Point3D { x: 0.0, y: 0.0, z: 1.0 },
@ -349,27 +347,27 @@ impl MemoryItem {
        }
    }

-    /// If this memory item is a function, call it with the given arguments, return its val as Ok.
-    /// If it's not a function, return Err.
    pub async fn call_fn(
        &self,
        args: Vec<MemoryItem>,
        memory: ProgramMemory,
        ctx: ExecutorContext,
    ) -> Result<Option<ProgramReturn>, KclError> {
-        let MemoryItem::Function { func, expression, meta } = &self else {
-            return Err(KclError::Semantic(KclErrorDetails {
+        if let MemoryItem::Function { func, expression, meta } = &self {
+            if let Some(func) = func {
+                func(args, memory, expression.clone(), meta.clone(), ctx).await
+            } else {
+                Err(KclError::Semantic(KclErrorDetails {
+                    message: format!("Not a function: {:?}", expression),
+                    source_ranges: vec![],
+                }))
+            }
+        } else {
+            Err(KclError::Semantic(KclErrorDetails {
                message: "not a in memory function".to_string(),
                source_ranges: vec![],
-            }));
-        };
-        let Some(func) = func else {
-            return Err(KclError::Semantic(KclErrorDetails {
-                message: format!("Not a function: {:?}", expression),
-                source_ranges: vec![],
-            }));
-        };
-        func(args, memory, expression.clone(), meta.clone(), ctx).await
+            }))
+        }
    }
 }

@ -778,11 +776,9 @@ impl Default for PipeInfo {
 pub struct ExecutorContext {
    pub engine: EngineConnection,
    pub planes: DefaultPlanes,
-    pub stdlib: Arc<StdLib>,
 }

 /// Execute a AST's program.
-#[async_recursion(?Send)]
 pub async fn execute(
    program: crate::ast::types::Program,
    memory: &mut ProgramMemory,
@ -795,9 +791,7 @@ pub async fn execute(
    for statement in &program.body {
        match statement {
            BodyItem::ExpressionStatement(expression_statement) => {
-                if let Value::PipeExpression(pipe_expr) = &expression_statement.expression {
-                    pipe_expr.get_result(memory, &mut pipe_info, ctx).await?;
-                } else if let Value::CallExpression(call_expr) = &expression_statement.expression {
+                if let Value::CallExpression(call_expr) = &expression_statement.expression {
                    let fn_name = call_expr.callee.name.to_string();
                    let mut args: Vec<MemoryItem> = Vec::new();
                    for arg in &call_expr.arguments {
@ -832,37 +826,24 @@ pub async fn execute(
                        }
                    }
                    let _show_fn = Box::new(crate::std::Show);
-                    match ctx.stdlib.get_either(&call_expr.callee.name) {
-                        FunctionKind::Core(func) => {
-                            use crate::docs::StdLibFn;
-                            if func.name() == _show_fn.name() {
-                                if options != BodyType::Root {
-                                    return Err(KclError::Semantic(KclErrorDetails {
-                                        message: "Cannot call show outside of a root".to_string(),
-                                        source_ranges: vec![call_expr.into()],
-                                    }));
-                                }
+                    if let Function::StdLib { func: _show_fn } = &call_expr.function {
+                        if options != BodyType::Root {
+                            return Err(KclError::Semantic(KclErrorDetails {
+                                message: "Cannot call show outside of a root".to_string(),
+                                source_ranges: vec![call_expr.into()],
+                            }));
+                        }

-                                memory.return_ = Some(ProgramReturn::Arguments(call_expr.arguments.clone()));
-                            }
-                        }
-                        FunctionKind::Std(func) => {
-                            let mut newmem = memory.clone();
-                            let result = execute(func.program().to_owned(), &mut newmem, BodyType::Block, ctx).await?;
-                            memory.return_ = result.return_;
-                        }
-                        FunctionKind::UserDefined => {
-                            if let Some(func) = memory.clone().root.get(&fn_name) {
-                                let result = func.call_fn(args.clone(), memory.clone(), ctx.clone()).await?;
+                        memory.return_ = Some(ProgramReturn::Arguments(call_expr.arguments.clone()));
+                    } else if let Some(func) = memory.clone().root.get(&fn_name) {
+                        let result = func.call_fn(args.clone(), memory.clone(), ctx.clone()).await?;

-                                memory.return_ = result;
-                            } else {
-                                return Err(KclError::Semantic(KclErrorDetails {
-                                    message: format!("No such name {} defined", fn_name),
-                                    source_ranges: vec![call_expr.into()],
-                                }));
-                            }
-                        }
+                        memory.return_ = result;
+                    } else {
+                        return Err(KclError::Semantic(KclErrorDetails {
+                            message: format!("No such name {} defined", fn_name),
+                            source_ranges: vec![call_expr.into()],
+                        }));
                    }
                }
            }
@ -908,9 +889,9 @@ pub async fn execute(
                                        // Add the arguments to the memory.
                                        for (index, param) in function_expression.params.iter().enumerate() {
                                            fn_memory.add(
-                                                &param.identifier.name,
+                                                &param.name,
                                                args.get(index).unwrap().clone(),
-                                                (&param.identifier).into(),
+                                                param.into(),
                                            )?;
                                        }

@ -1030,11 +1011,7 @@ mod tests {
        let mut mem: ProgramMemory = Default::default();
        let engine = EngineConnection::new().await?;
        let planes = DefaultPlanes::new(&engine).await?;
-        let ctx = ExecutorContext {
-            engine,
-            planes,
-            stdlib: Arc::new(StdLib::default()),
-        };
+        let ctx = ExecutorContext { engine, planes };
        let memory = execute(program, &mut mem, BodyType::Root, &ctx).await?;

        Ok(memory)
--- a/src/wasm-lib/kcl/src/lib.rs
+++ b/src/wasm-lib/kcl/src/lib.rs
@ -1,7 +1,3 @@
-//! Rust support for KCL (aka the KittyCAD Language).
-//!
-//! KCL is written in Rust. This crate contains the compiler tooling (e.g. parser, lexer, code generation),
-//! the standard library implementation, a LSP implementation, generator for the docs, and more.
 #![recursion_limit = "1024"]

 pub mod ast;
@ -9,6 +5,7 @@ pub mod docs;
 pub mod engine;
 pub mod errors;
 pub mod executor;
+pub mod math_parser;
 pub mod parser;
 pub mod server;
 pub mod std;
--- a/src/wasm-lib/kcl/src/math_parser.rs
+++ b/src/wasm-lib/kcl/src/math_parser.rs
--- a/src/wasm-lib/kcl/src/parser.rs
+++ b/src/wasm-lib/kcl/src/parser.rs
--- a/src/wasm-lib/kcl/src/parser/math.rs
+++ b/src/wasm-lib/kcl/src/parser/math.rs
@ -1,163 +0,0 @@
-use crate::{
-    ast::types::{BinaryExpression, BinaryOperator, BinaryPart},
-    errors::{KclError, KclErrorDetails},
-    executor::SourceRange,
-};
-
-/// Parses a list of tokens (in infix order, i.e. as the user typed them)
-/// into a binary expression tree.
-pub fn parse(infix_tokens: Vec<BinaryExpressionToken>) -> Result<BinaryExpression, KclError> {
-    let rpn = postfix(infix_tokens);
-    evaluate(rpn)
-}
-
-/// Parses a list of tokens (in postfix order) into a binary expression tree.
-fn evaluate(rpn: Vec<BinaryExpressionToken>) -> Result<BinaryExpression, KclError> {
-    let source_ranges = source_range(&rpn);
-    let mut operand_stack: Vec<BinaryPart> = Vec::new();
-    let e = KclError::Internal(KclErrorDetails {
-        source_ranges,
-        message: "error parsing binary math expressions".to_owned(),
-    });
-    for item in rpn {
-        let expr = match item {
-            BinaryExpressionToken::Operator(operator) => {
-                let Some(right) = operand_stack.pop() else {
-                    return Err(e);
-                };
-                let Some(left) = operand_stack.pop() else {
-                    return Err(e);
-                };
-                BinaryPart::BinaryExpression(Box::new(BinaryExpression {
-                    start: left.start(),
-                    end: right.end(),
-                    operator,
-                    left,
-                    right,
-                }))
-            }
-            BinaryExpressionToken::Operand(o) => o,
-        };
-        operand_stack.push(expr)
-    }
-    if let Some(BinaryPart::BinaryExpression(expr)) = operand_stack.pop() {
-        Ok(*expr)
-    } else {
-        // If this branch is used, the evaluation algorithm has a bug and must be fixed.
-        // This is a programmer error, not a user error.
-        Err(e)
-    }
-}
-
-fn source_range(tokens: &[BinaryExpressionToken]) -> Vec<SourceRange> {
-    let sources: Vec<_> = tokens
-        .iter()
-        .filter_map(|op| match op {
-            BinaryExpressionToken::Operator(_) => None,
-            BinaryExpressionToken::Operand(o) => Some((o.start(), o.end())),
-        })
-        .collect();
-    match (sources.first(), sources.last()) {
-        (Some((start, _)), Some((_, end))) => vec![SourceRange([*start, *end])],
-        _ => Vec::new(),
-    }
-}
-
-/// Reorders tokens from infix order to postfix order.
-fn postfix(infix: Vec<BinaryExpressionToken>) -> Vec<BinaryExpressionToken> {
-    let mut operator_stack: Vec<BinaryOperator> = Vec::with_capacity(infix.len());
-    let mut output = Vec::with_capacity(infix.len());
-    for token in infix {
-        match token {
-            BinaryExpressionToken::Operator(o1) => {
-                // From https://en.wikipedia.org/wiki/Shunting_yard_algorithm:
-                // while (
-                //     there is an operator o2 at the top of the operator stack which is not a left parenthesis,
-                //     and (o2 has greater precedence than o1 or (o1 and o2 have the same precedence and o1 is left-associative))
-                // )
-                // pop o2 from the operator stack into the output queue
-                while let Some(o2) = operator_stack.pop() {
-                    if (o2.precedence() > o1.precedence())
-                        || o1.precedence() == o2.precedence() && o1.associativity().is_left()
-                    {
-                        output.push(BinaryExpressionToken::Operator(o2));
-                    } else {
-                        operator_stack.push(o2);
-                        break;
-                    }
-                }
-                operator_stack.push(o1);
-            }
-            o @ BinaryExpressionToken::Operand(_) => output.push(o),
-        }
-    }
-    // After the while loop, pop the remaining items from the operator stack into the output queue.
-    output.extend(operator_stack.into_iter().rev().map(BinaryExpressionToken::Operator));
-    output
-}
-
-/// Expressions are made up of operators and operands.
-#[derive(PartialEq, Debug)]
-pub enum BinaryExpressionToken {
-    Operator(BinaryOperator),
-    Operand(BinaryPart),
-}
-
-impl From<BinaryPart> for BinaryExpressionToken {
-    fn from(value: BinaryPart) -> Self {
-        Self::Operand(value)
-    }
-}
-
-impl From<BinaryOperator> for BinaryExpressionToken {
-    fn from(value: BinaryOperator) -> Self {
-        Self::Operator(value)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use crate::ast::types::Literal;
-
-    use super::*;
-
-    #[test]
-    fn parse_and_evaluate() {
-        /// Make a literal
-        fn lit(n: u8) -> BinaryPart {
-            BinaryPart::Literal(Box::new(Literal {
-                start: 0,
-                end: 0,
-                value: n.into(),
-                raw: n.to_string(),
-            }))
-        }
-        let tests: Vec<Vec<BinaryExpressionToken>> = vec![
-            // 3 + 4 × 2 ÷ ( 1 − 5 ) ^ 2 ^ 3
-            vec![
-                lit(3).into(),
-                BinaryOperator::Add.into(),
-                lit(4).into(),
-                BinaryOperator::Mul.into(),
-                lit(2).into(),
-                BinaryOperator::Div.into(),
-                BinaryPart::BinaryExpression(Box::new(BinaryExpression {
-                    start: 0,
-                    end: 0,
-                    operator: BinaryOperator::Sub,
-                    left: lit(1),
-                    right: lit(5),
-                }))
-                .into(),
-                BinaryOperator::Pow.into(),
-                lit(2).into(),
-                BinaryOperator::Pow.into(),
-                lit(3).into(),
-            ],
-        ];
-        for infix_input in tests {
-            let rpn = postfix(infix_input);
-            let _tree = evaluate(rpn).unwrap();
-        }
-    }
-}
--- a/src/wasm-lib/kcl/src/parser/parser_impl.rs
+++ b/src/wasm-lib/kcl/src/parser/parser_impl.rs
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__a.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__a.snap
@ -1,26 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 5,
-  "operator": "+",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 4,
-    "end": 5,
-    "value": 2,
-    "raw": "2"
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__b.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__b.snap
@ -1,26 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 3,
-  "operator": "+",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 2,
-    "end": 3,
-    "value": 2,
-    "raw": "2"
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__c.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__c.snap
@ -1,26 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 4,
-  "operator": "-",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 3,
-    "end": 4,
-    "value": 2,
-    "raw": "2"
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__d.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__d.snap
@ -1,41 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 9,
-  "operator": "+",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 4,
-    "end": 9,
-    "operator": "*",
-    "left": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 4,
-      "end": 5,
-      "value": 2,
-      "raw": "2"
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 8,
-      "end": 9,
-      "value": 3,
-      "raw": "3"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__e.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__e.snap
@ -1,41 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 11,
-  "operator": "*",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 6,
-    "end": 11,
-    "operator": "+",
-    "left": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 6,
-      "end": 7,
-      "value": 2,
-      "raw": "2"
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 10,
-      "end": 11,
-      "value": 3,
-      "raw": "3"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__f.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__f.snap
@ -1,56 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 17,
-  "operator": "/",
-  "left": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 0,
-    "end": 11,
-    "operator": "*",
-    "left": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 0,
-      "end": 1,
-      "value": 1,
-      "raw": "1"
-    },
-    "right": {
-      "type": "BinaryExpression",
-      "type": "BinaryExpression",
-      "start": 6,
-      "end": 11,
-      "operator": "+",
-      "left": {
-        "type": "Literal",
-        "type": "Literal",
-        "start": 6,
-        "end": 7,
-        "value": 2,
-        "raw": "2"
-      },
-      "right": {
-        "type": "Literal",
-        "type": "Literal",
-        "start": 10,
-        "end": 11,
-        "value": 3,
-        "raw": "3"
-      }
-    }
-  },
-  "right": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 16,
-    "end": 17,
-    "value": 4,
-    "raw": "4"
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__g.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__g.snap
@ -1,56 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 17,
-  "operator": "+",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 6,
-    "end": 17,
-    "operator": "/",
-    "left": {
-      "type": "BinaryExpression",
-      "type": "BinaryExpression",
-      "start": 6,
-      "end": 11,
-      "operator": "+",
-      "left": {
-        "type": "Literal",
-        "type": "Literal",
-        "start": 6,
-        "end": 7,
-        "value": 2,
-        "raw": "2"
-      },
-      "right": {
-        "type": "Literal",
-        "type": "Literal",
-        "start": 10,
-        "end": 11,
-        "value": 3,
-        "raw": "3"
-      }
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 16,
-      "end": 17,
-      "value": 4,
-      "raw": "4"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__h.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__h.snap
@ -1,71 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 22,
-  "operator": "*",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 7,
-    "end": 22,
-    "operator": "+",
-    "left": {
-      "type": "BinaryExpression",
-      "type": "BinaryExpression",
-      "start": 7,
-      "end": 18,
-      "operator": "/",
-      "left": {
-        "type": "BinaryExpression",
-        "type": "BinaryExpression",
-        "start": 7,
-        "end": 12,
-        "operator": "+",
-        "left": {
-          "type": "Literal",
-          "type": "Literal",
-          "start": 7,
-          "end": 8,
-          "value": 2,
-          "raw": "2"
-        },
-        "right": {
-          "type": "Literal",
-          "type": "Literal",
-          "start": 11,
-          "end": 12,
-          "value": 3,
-          "raw": "3"
-        }
-      },
-      "right": {
-        "type": "Literal",
-        "type": "Literal",
-        "start": 17,
-        "end": 18,
-        "value": 4,
-        "raw": "4"
-      }
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 21,
-      "end": 22,
-      "value": 5,
-      "raw": "5"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__i.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__i.snap
@ -1,41 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 13,
-  "operator": "*",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 1,
-    "raw": "1"
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 8,
-    "end": 13,
-    "operator": "+",
-    "left": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 8,
-      "end": 9,
-      "value": 2,
-      "raw": "2"
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 12,
-      "end": 13,
-      "value": 3,
-      "raw": "3"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__j.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__j.snap
@ -1,81 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 44,
-  "operator": "/",
-  "left": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 0,
-    "end": 22,
-    "operator": "*",
-    "left": {
-      "type": "BinaryExpression",
-      "type": "BinaryExpression",
-      "start": 0,
-      "end": 18,
-      "operator": "*",
-      "left": {
-        "type": "BinaryExpression",
-        "type": "BinaryExpression",
-        "start": 0,
-        "end": 12,
-        "operator": "*",
-        "left": {
-          "type": "Identifier",
-          "type": "Identifier",
-          "start": 0,
-          "end": 8,
-          "name": "distance"
-        },
-        "right": {
-          "type": "Identifier",
-          "type": "Identifier",
-          "start": 11,
-          "end": 12,
-          "name": "p"
-        }
-      },
-      "right": {
-        "type": "Identifier",
-        "type": "Identifier",
-        "start": 15,
-        "end": 18,
-        "name": "FOS"
-      }
-    },
-    "right": {
-      "type": "Literal",
-      "type": "Literal",
-      "start": 21,
-      "end": 22,
-      "value": 6,
-      "raw": "6"
-    }
-  },
-  "right": {
-    "type": "BinaryExpression",
-    "type": "BinaryExpression",
-    "start": 26,
-    "end": 44,
-    "operator": "*",
-    "left": {
-      "type": "Identifier",
-      "type": "Identifier",
-      "start": 26,
-      "end": 36,
-      "name": "sigmaAllow"
-    },
-    "right": {
-      "type": "Identifier",
-      "type": "Identifier",
-      "start": 39,
-      "end": 44,
-      "name": "width"
-    }
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__k.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_math_tests__k.snap
@ -1,26 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "type": "BinaryExpression",
-  "start": 0,
-  "end": 8,
-  "operator": "+",
-  "left": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 0,
-    "end": 1,
-    "value": 2,
-    "raw": "2"
-  },
-  "right": {
-    "type": "Literal",
-    "type": "Literal",
-    "start": 7,
-    "end": 8,
-    "value": 3,
-    "raw": "3"
-  }
-}
--- a/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_tests__a.snap
+++ b/src/wasm-lib/kcl/src/parser/snapshots/kcl_libparserparser_impl__snapshot_tests__a.snap
@ -1,263 +0,0 @@
---
-source: kcl/src/parser/parser_impl.rs
-expression: actual
---
-{
-  "start": 0,
-  "end": 144,
-  "body": [
-    {
-      "type": "VariableDeclaration",
-      "type": "VariableDeclaration",
-      "start": 0,
-      "end": 143,
-      "declarations": [
-        {
-          "type": "VariableDeclarator",
-          "start": 6,
-          "end": 143,
-          "id": {
-            "type": "Identifier",
-            "start": 6,
-            "end": 15,
-            "name": "boxSketch"
-          },
-          "init": {
-            "type": "PipeExpression",
-            "type": "PipeExpression",
-            "start": 18,
-            "end": 143,
-            "body": [
-              {
-                "type": "CallExpression",
-                "type": "CallExpression",
-                "start": 18,
-                "end": 39,
-                "callee": {
-                  "type": "Identifier",
-                  "start": 18,
-                  "end": 31,
-                  "name": "startSketchAt"
-                },
-                "arguments": [
-                  {
-                    "type": "ArrayExpression",
-                    "type": "ArrayExpression",
-                    "start": 32,
-                    "end": 38,
-                    "elements": [
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 33,
-                        "end": 34,
-                        "value": 0,
-                        "raw": "0"
-                      },
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 36,
-                        "end": 37,
-                        "value": 0,
-                        "raw": "0"
-                      }
-                    ]
-                  }
-                ],
-                "optional": false
-              },
-              {
-                "type": "CallExpression",
-                "type": "CallExpression",
-                "start": 47,
-                "end": 63,
-                "callee": {
-                  "type": "Identifier",
-                  "start": 47,
-                  "end": 51,
-                  "name": "line"
-                },
-                "arguments": [
-                  {
-                    "type": "ArrayExpression",
-                    "type": "ArrayExpression",
-                    "start": 52,
-                    "end": 59,
-                    "elements": [
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 53,
-                        "end": 54,
-                        "value": 0,
-                        "raw": "0"
-                      },
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 56,
-                        "end": 58,
-                        "value": 10,
-                        "raw": "10"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution",
-                    "start": 61,
-                    "end": 62
-                  }
-                ],
-                "optional": false
-              },
-              {
-                "type": "CallExpression",
-                "type": "CallExpression",
-                "start": 71,
-                "end": 96,
-                "callee": {
-                  "type": "Identifier",
-                  "start": 71,
-                  "end": 84,
-                  "name": "tangentialArc"
-                },
-                "arguments": [
-                  {
-                    "type": "ArrayExpression",
-                    "type": "ArrayExpression",
-                    "start": 85,
-                    "end": 92,
-                    "elements": [
-                      {
-                        "type": "UnaryExpression",
-                        "type": "UnaryExpression",
-                        "start": 86,
-                        "end": 88,
-                        "operator": "-",
-                        "argument": {
-                          "type": "Literal",
-                          "type": "Literal",
-                          "start": 87,
-                          "end": 88,
-                          "value": 5,
-                          "raw": "5"
-                        }
-                      },
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 90,
-                        "end": 91,
-                        "value": 5,
-                        "raw": "5"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution",
-                    "start": 94,
-                    "end": 95
-                  }
-                ],
-                "optional": false
-              },
-              {
-                "type": "CallExpression",
-                "type": "CallExpression",
-                "start": 104,
-                "end": 121,
-                "callee": {
-                  "type": "Identifier",
-                  "start": 104,
-                  "end": 108,
-                  "name": "line"
-                },
-                "arguments": [
-                  {
-                    "type": "ArrayExpression",
-                    "type": "ArrayExpression",
-                    "start": 109,
-                    "end": 117,
-                    "elements": [
-                      {
-                        "type": "Literal",
-                        "type": "Literal",
-                        "start": 110,
-                        "end": 111,
-                        "value": 5,
-                        "raw": "5"
-                      },
-                      {
-                        "type": "UnaryExpression",
-                        "type": "UnaryExpression",
-                        "start": 113,
-                        "end": 116,
-                        "operator": "-",
-                        "argument": {
-                          "type": "Literal",
-                          "type": "Literal",
-                          "start": 114,
-                          "end": 116,
-                          "value": 15,
-                          "raw": "15"
-                        }
-                      }
-                    ]
-                  },
-                  {
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution",
-                    "start": 119,
-                    "end": 120
-                  }
-                ],
-                "optional": false
-              },
-              {
-                "type": "CallExpression",
-                "type": "CallExpression",
-                "start": 129,
-                "end": 143,
-                "callee": {
-                  "type": "Identifier",
-                  "start": 129,
-                  "end": 136,
-                  "name": "extrude"
-                },
-                "arguments": [
-                  {
-                    "type": "Literal",
-                    "type": "Literal",
-                    "start": 137,
-                    "end": 139,
-                    "value": 10,
-                    "raw": "10"
-                  },
-                  {
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution",
-                    "start": 141,
-                    "end": 142
-                  }
-                ],
-                "optional": false
-              }
-            ],
-            "nonCodeMeta": {
-              "nonCodeNodes": {},
-              "start": []
-            }
-          }
-        }
-      ],
-      "kind": "const"
-    }
-  ],
-  "nonCodeMeta": {
-    "nonCodeNodes": {},
-    "start": []
-  }
-}
--- a/Show More
+++ b/Show More