diff --git a/package.json b/package.json
index e8b570b..61b06ee 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "prepare-s3-test": "docker run -d -p 9000:9000 --name minio -e MINIO_ACCESS_KEY=minioadmin -e MINIO_SECRET_KEY=minioadmin -v /tmp/data:/data -v /tmp/config:/root/.minio minio/minio server /data",
     "setup-gateway-servers": "pnpm run '/^pretest:/'",
     "pretest:partykit": "cd tests/connect-partykit/app && pnpm run dev",
-    "pretest:netlify": "cd tests/connect-netlify/app && pnpm run copy-server && pnpm --package=netlify-cli dlx netlify dev --no-open",
+    "pretest:netlify": "cd tests/connect-netlify/app && pnpm run copy-server && pnpm --package=netlify-cli dlx netlify --version && pnpm --package=netlify-cli dlx netlify dev --no-open",
     "test-gateways": "vitest --run connector gateway",
     "test": "vitest --run",
     "stop-s3-test": "docker rm -f minio",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c673f7..b96d8ff 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -858,7 +858,7 @@ packages:
     engines: {node: '>=14'}
 
   '@fireproof/core@file:../fireproof/dist/fireproof-core/fireproof-core-0.0.0-smoke.tgz':
-    resolution: {integrity: sha512-iYLnSmmfb9NmWdZavDqm07Q/rhR6nSy8XyR6LeIN+BuMfQ/7FM1OimJsWv5EuUAcV6V1+dM/66p5AMO4CIG2ZA==, tarball: file:../fireproof/dist/fireproof-core/fireproof-core-0.0.0-smoke.tgz}
+    resolution: {integrity: sha512-Act6RZ3KWIcpBhMmCcrlAbCTdR5ySdHDmgdRP7awetGVWVndnT3rfyHPIz/t5s/o4fK839qQoBcVS34BLCSYaA==, tarball: file:../fireproof/dist/fireproof-core/fireproof-core-0.0.0-smoke.tgz}
     version: 0.0.0-smoke
     peerDependencies:
       react: '>=18.0.0'
@@ -4273,7 +4273,7 @@ snapshots:
       multiformats: 13.3.0
       murmurhash3js-revisited: 3.0.0
 
-  '@netlify/blobs@7.4.0': {}
+  '@netlify/blobs@8.1.0': {}
 
   '@noble/curves@1.6.0':
     dependencies:
diff --git a/tests/connect-netlify/app/.gitignore b/tests/connect-netlify/app/.gitignore
index 40bbae1..e9976d3 100644
--- a/tests/connect-netlify/app/.gitignore
+++ b/tests/connect-netlify/app/.gitignore
@@ -4,3 +4,5 @@ node_modules
 .netlify
 *.iife.js
 *.global.js
+*.js.map
+netlify/edge-functions/fireproof.ts
diff --git a/tests/connect-netlify/app/netlify.toml b/tests/connect-netlify/app/netlify.toml
new file mode 100644
index 0000000..f0d0333
--- /dev/null
+++ b/tests/connect-netlify/app/netlify.toml
@@ -0,0 +1,8 @@
+[build]
+  command = "# no build command"
+  publish = ""
+
+[dev]
+  functions = "netlify/edge-functions"
+  port = 8888
+  publish = "public"
diff --git a/tests/connect-netlify/app/netlify/edge-functions/fireproof.ts b/tests/connect-netlify/app/netlify/edge-functions/fireproof.ts
deleted file mode 100644
index 831b115..0000000
--- a/tests/connect-netlify/app/netlify/edge-functions/fireproof.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { getStore } from "@netlify/blobs";
-
-interface CRDTEntry {
-  readonly data: string;
-  readonly cid: string;
-  readonly parents: string[];
-}
-
-export default async (req: Request) => {
-  const url = new URL(req.url);
-  const carId = url.searchParams.get("car");
-  const metaDb = url.searchParams.get("meta");
-
-  if (req.method === "PUT") {
-    if (carId) {
-      const carFiles = getStore("cars");
-      const carArrayBuffer = new Uint8Array(await req.arrayBuffer());
-      await carFiles.set(carId, carArrayBuffer);
-      return new Response(JSON.stringify({ ok: true }), { status: 201 });
-    } else if (metaDb) {
-      const meta = getStore("meta");
-      const x = await req.json();
-      // fixme, marty changed to [0] as it is a slice of the structure we expected
-      const { data, cid, parents } = x[0] as CRDTEntry;
-      await meta.setJSON(`${metaDb}/${cid}`, { data, parents });
-      return new Response(JSON.stringify({ ok: true }), { status: 201 });
-    }
-  } else if (req.method === "GET") {
-    if (carId) {
-      const carFiles = getStore("cars");
-      const carArrayBuffer = await carFiles.get(carId, { type: "arrayBuffer" });
-      return new Response(carArrayBuffer, { status: 200 });
-    } else if (metaDb) {
-      // Problem: Deletion operations are faster than write operations, leading to an empty list most of the time if deletes happen at PUT time.
-      // Solution: Delay deletes until GET operation. Utilize the parents list during read operation to mask and delete outdated entries.
-      const meta = getStore("meta");
-      const { blobs } = await meta.list({ prefix: `${metaDb}/` });
-      const allParents = [] as string[];
-      const entries = (
-        await Promise.all(
-          blobs.map(async (blob) => {
-            const blobContents = await meta.get(blob.key, {
-              type: "json",
-            });
-            if (!blobContents) {
-              return { cid: blob.key.split("/")[1], data: null };
-            }
-            const { data, parents } = blobContents;
-            if (parents) {
-              for (const p of parents) {
-                allParents.push(p.toString());
-                void meta.delete(`${metaDb}/${p}`);
-              }
-            }
-            return { cid: blob.key.split("/")[1], data, parents };
-          })
-        )
-      ).filter((entry) => entry.data !== null && !allParents.includes(entry.cid));
-      return new Response(JSON.stringify(entries), { status: 200 });
-    }
-  } else if (req.method === "DELETE") {
-    if (carId) {
-      const carFiles = getStore("cars");
-      await carFiles.delete(carId);
-      return new Response(JSON.stringify({ ok: true }), { status: 200 });
-    } else if (metaDb) {
-      const meta = getStore("meta");
-      const { blobs } = await meta.list({ prefix: `${metaDb}/` });
-      await Promise.all(blobs.map((blob) => meta.delete(blob.key)));
-      return new Response(JSON.stringify({ ok: true }), { status: 200 });
-    } else {
-      const meta = getStore("meta");
-      const { blobs } = await meta.list({ prefix: `main/` });
-      for (const blob of blobs) {
-        await meta.delete(blob.key);
-      }
-      return new Response(JSON.stringify({ ok: true }), { status: 200 });
-    }
-  }
-
-  return new Response(JSON.stringify({ error: "Invalid path" }), {
-    status: 400,
-  });
-};
-
-export const config = { path: "/fireproof" };
diff --git a/tests/connect-netlify/app/package.json b/tests/connect-netlify/app/package.json
index 94b6bc6..ac84223 100644
--- a/tests/connect-netlify/app/package.json
+++ b/tests/connect-netlify/app/package.json
@@ -6,10 +6,11 @@
   "main": "index.html",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "copy-server": "cp ../../../src/netlify/server.ts netlify/edge-functions/fireproof.ts",
-    "watch-server": "chokidar \"../../../src/netlify/server.ts\" -c \"npm run copy-server\"",
-    "predev": "npm run copy-server && npm run watch-server &",
-    "dev": "npx netlify dev --no-open"
+    "copy-server": "mkdir -p netlify/edge-functions && cp ../../../src/netlify/server.ts netlify/edge-functions/fireproof.ts",
+    "watch-server": "chokidar \"../../../src/netlify/server.ts\" -c \"pnpm run copy-server\"",
+    "watch": "pnpm run copy-server && pnpm run watch-server &",
+    "watch-dev": "pnpm run watch & pnpm run dev",
+    "dev": "pnpm --package=netlify-cli dlx netlify --version && pnpm --package=netlify-cli dlx netlify dev --no-open"
   },
   "author": "",
   "license": "ISC",
diff --git a/tests/connect-netlify/app/public/index.html b/tests/connect-netlify/app/public/index.html
new file mode 100644
index 0000000..b8db318
--- /dev/null
+++ b/tests/connect-netlify/app/public/index.html
@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Fireproof Test</title>
+    <script src="./index.global.js"></script>
+    <script src="./connect-netlify.iife.js"></script>
+    <script type="text/javascript">
+      function todoApp() {
+        const actorTag = Math.random().toString(36).substring(2, 7)
+        const { fireproof, index } = Fireproof
+        const { connect } = FireproofConnect
+
+        let dbName
+        let db
+        // let cx
+
+        let dbUnsubscribe = false
+
+        function setupDb(name, newDb, newConn) {
+          const input = document.querySelector('#todo')
+          input.disabled = true
+
+          if (dbUnsubscribe) {
+            dbUnsubscribe()
+          }
+          if (newDb) {
+            name = newDb.name
+            dbName = newDb.name
+            db = newDb
+            // cx = newConn
+            const input = document.querySelector('#list')
+            input.value = dbName
+          } else {
+            dbName = name
+            db = fireproof(name)
+            // cx = connect.netlify(db)
+            // cx.ready.then(async () => {
+            //   const span = document.querySelector('#cxInfo')
+            //   span.innerText = `📡 ${cx.name}`
+            // })
+          }
+
+          window.db = db
+          // window.cx = cx
+
+          db.changes([], { limit: 1 }).then(changes => {
+            if (changes.clock.length > 0) {
+              input.disabled = false
+            } else {
+              // cx.ready.then(async () => {
+                input.disabled = false
+              // })
+            }
+          })
+
+          dbUnsubscribe = db.subscribe(redraw)
+          return db
+        }
+
+        let doing
+        const redraw = async () => {
+          if (doing) {
+            return doing
+          }
+          doing = doRedraw().finally(() => (doing = null))
+          return doing
+        }
+        window.redraw = redraw
+
+        let compactor = '🚗'
+        function drawInfo() {
+          document.querySelector(
+            '#carLog'
+          ).innerText = ` ⏰ ${db._crdt.clock.head.length} ${compactor}`
+        }
+        const doRedraw = async () => {
+          drawInfo()
+          const result = await db.allDocs()
+          drawInfo()
+          document.querySelector('ul').innerHTML = ''
+          for (const row of result.rows) {
+            // const doc = await db.get(row.id);
+            const doc = row.value
+            const checkbox = document.createElement('input')
+            checkbox.setAttribute('type', 'checkbox')
+            if (doc.completed) {
+              checkbox.setAttribute('checked', true)
+            }
+            checkbox.onchange = async e => {
+              e.target.indeterminate = true
+              const clicks = doc.clicks || 0
+              doc.clicks = clicks + 1
+              doc.completed = !doc.completed
+              await db.put(doc)
+            }
+            const textSpan = document.createElement('span')
+            textSpan.innerText = `${doc.actor}:${doc.clicks || 0}`
+            textSpan.style.fontFamily = 'monospace'
+            const taskSpan = document.createElement('span')
+            taskSpan.innerText = doc.task
+            taskSpan.style.display = 'block'
+            taskSpan.style.padding = '5px'
+            const li = document.createElement('li')
+            li.appendChild(checkbox)
+            li.appendChild(textSpan)
+            li.appendChild(taskSpan)
+            document.querySelector('ul').appendChild(li)
+          }
+        }
+
+        async function initialize() {
+          ps = new URLSearchParams(location.search)
+          const listQ = ps.get('list')
+          setupDb(listQ || 'my-list')
+          const input = document.querySelector('#list')
+          input.value = dbName
+          redraw()
+        }
+
+        async function openDashboard(e) {
+          db.openDashboard()
+        }
+        window.openDashboard = openDashboard
+
+        async function changeList(e) {
+          e.preventDefault()
+          const input = document.querySelector('#list')
+          dbName = input.value
+          history.pushState(null, '', location.pathname + '?list=' + encodeURIComponent(dbName))
+          setupDb(dbName)
+          redraw()
+        }
+        window.changeList = changeList
+
+        async function createTodoClick(e) {
+          e.preventDefault()
+          const input = document.querySelector('#todo')
+          input.disabled = true
+          const ok = await db.put({
+            actor: actorTag,
+            created: Date.now(),
+            task: input.value,
+            completed: false
+          })
+          input.disabled = false
+          input.value = ''
+        }
+        window.createTodoClick = createTodoClick
+
+        // togglePolling
+        let poller
+        async function startPoller() {
+          const button = document.querySelector('#polling')
+          button.innerText = '🔄'
+          poller = setInterval(async () => {
+            // await cx.refresh()
+          }, 3000)
+        }
+        const stopPoller = () => {
+          const button = document.querySelector('#polling')
+          button.innerText = '⏯️'
+          clearInterval(poller)
+        }
+        const togglePolling = e => {
+          e.preventDefault()
+          if (poller) {
+            stopPoller()
+          } else {
+            startPoller(e)
+          }
+        }
+        window.togglePolling = togglePolling
+
+        let worker
+        async function startWorker() {
+          const button = document.querySelector('#robot')
+          button.innerText = '🦾'
+          const dcs = await db.allDocs()
+          console.log('start worker', dcs.rows.length)
+          goWorker(dcs)
+        }
+        const goWorker = dcs => {
+          worker = setTimeout(async () => {
+            await Promise.all(
+              dcs.rows.slice(0, 5).map(r => {
+                r.value.clicks = r.value.clicks || 0
+                r.value.clicks += 1
+                r.value.completed = Math.random() > 0.5
+                db.put({ ...r.value })
+              })
+            )
+            goWorker(dcs)
+          }, Math.floor(Math.random() * 5000) + 5000)
+        }
+
+        const stopWorker = () => {
+          const button = document.querySelector('#robot')
+          button.innerText = '🤖'
+          console.log('stop worker')
+          clearTimeout(worker)
+        }
+        const toggleWorker = e => {
+          e.preventDefault()
+          if (worker) {
+            stopWorker()
+          } else {
+            startWorker(e)
+          }
+        }
+        window.toggleWorker = toggleWorker
+
+        async function doCompact(e) {
+          e.preventDefault()
+          compactor = '🚕'
+          drawInfo()
+          await db.compact()
+          drawInfo()
+          compactor = '🚗'
+        }
+        window.doCompact = doCompact
+
+        window.onload = initialize
+        window.db = db
+      }
+
+      todoApp()
+    </script>
+  </head>
+
+  <body>
+    <h1>Fireproof Todos</h1>
+    List:
+    <input
+      title="Change list"
+      type="text"
+      name="list"
+      id="list"
+      onkeydown="if (event.keyCode == 13) changeList(event)"
+    />
+    <button onclick="changeList(event)">Change List</button>
+
+    <p>
+      Fireproof stores data locally and encrypts it before sending it to the cloud. This demo uses
+      Netlify Edge Functions, but you can easily run Fireproof on S3 or another provider. You also
+      accelerate sync times by using a real-time adapter like PartyKit or WebRTC, this demo polls
+      the server every 3 seconds.
+      <a href="https://use-fireproof.com/">Learn more in the Fireproof developer docs</a> or
+      <a href="https://github.com/fireproof-storage/todo-netlify">fork the app here</a>.
+    </p>
+
+    <button id="robot" onclick="toggleWorker(event)">Load gen 🤖</button>
+    <button id="polling" onclick="togglePolling(event)">Start polling 🪩</button>
+    <br />
+    <span id="carLog" onclick="doCompact(event)"></span>
+    <br />
+    <span id="cxInfo"></span>
+
+    <h3>Todos</h3>
+    <input
+      title="Create a todo"
+      type="text"
+      name="todo"
+      id="todo"
+      onkeydown="if (event.keyCode == 13) createTodoClick(event)"
+    />
+    <button onclick="createTodoClick(event)">Create Todo</button>
+    <ul></ul>
+  </body>
+</html>
diff --git a/tests/connect-partykit/app/.gitignore b/tests/connect-partykit/app/.gitignore
new file mode 100644
index 0000000..664ad9a
--- /dev/null
+++ b/tests/connect-partykit/app/.gitignore
@@ -0,0 +1 @@
+src/server.ts
\ No newline at end of file