diff --git a/.github/actions/changelog/action.yml b/.github/actions/changelog/action.yml
new file mode 100644
index 0000000..0d27730
--- /dev/null
+++ b/.github/actions/changelog/action.yml
@@ -0,0 +1,56 @@
+name: Generate changelog
+description: Generate the changelog
+outputs:
+  release-type:
+    description: Release type
+    value: ${{ steps.log.outputs.release-type }}
+  version:
+    description: Next version
+    value: ${{ steps.log.outputs.next-version }}
+  issues-closed:
+    description: Issues closed
+    value: ${{ steps.log.outputs.issues-closed }}
+  changelog:
+    description: Changelog value
+    value: ${{ steps.log.outputs.changelog }}
+  should-release:
+    description: Should release
+    value: ${{ steps.log.outputs.should-release }}
+runs:
+  using: composite
+  steps:
+    - name: Conditional args
+      id: args
+      if: ${{ startsWith(github.ref, 'refs/tags/') }}
+      shell: bash
+      run: >
+        echo "before=${{ github.ref_name }}" >> $GITHUB_OUTPUT &&
+        echo "until=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+
+    - name: Get last tag
+      id: last-tag
+      uses: alorel-actions/semantic-release-lite/last-tag@v0
+      with:
+        before: ${{ steps.args.outputs.before }}
+
+    - name: Generate changelog
+      id: log
+      uses: alorel-actions/semantic-release-lite/generate-changelog@v0
+      with:
+        last-tag: ${{ steps.last-tag.outputs.last-tag }}
+        from: ${{ steps.last-tag.outputs.last-tag }}
+        until: ${{ steps.args.outputs.until || github.sha }}
+        stay-at-zero: true
+        minor-types: |
+          feat: Features
+          rm: Removals
+        patch-types: |
+          fix: Bug Fixes
+          perf: Performance
+          chore: Maintenance
+          deps: Dependency updates
+          refactor: Refactors
+          docs: Documentation
+        trivial-types: |
+          ci: CI & Build
+          build: CI & Build
diff --git a/.github/actions/prep-release/action.yml b/.github/actions/prep-release/action.yml
deleted file mode 100644
index e232ed4..0000000
--- a/.github/actions/prep-release/action.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Prep release
-description: Prepare the release
-inputs:
-  release-type:
-    description: Release type
-    required: true
-  version:
-    description: Next version
-    required: true
-outputs:
-  in-sync:
-    description: Sync check
-    value: ${{ steps.sync-check.outputs.in-sync }}
-runs:
-  using: composite
-  steps:
-    - name: Git identity
-      uses: alorel-actions/git-ident@v1
-    - name: Init toolchain
-      uses: alorel-actions/cargo/init@v1
-      id: toolchain
-      with:
-        cache-prefix: release
-    - name: cargo-bump
-      uses: alorel-actions/cargo/bump@v1
-      with:
-        release-type: ${{ inputs.release-type }}
-    - name: Sync check
-      id: sync-check
-      uses: alorel-actions/semantic-release-lite/sync-check@v0
diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
deleted file mode 100644
index e09a911..0000000
--- a/.github/actions/release/action.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Release
-description: Do the release
-inputs:
-  version:
-    description: Version to release
-    required: true
-  changelog:
-    description: The changelog
-    required: true
-  issues-closed:
-    description: Issues we've closed
-  crates-io-token:
-    description: crates.io API token
-    required: true
-runs:
-  using: composite
-  steps:
-    - uses: alorel-actions/cargo/release-git@v1
-      with:
-        version: ${{ inputs.version }}
-        changelog: ${{ inputs.changelog }}
-
-    - name: Publish crate
-      shell: bash
-      run: cargo publish --locked --token ${{ inputs.crates-io-token }}
-
-    - name: Notify
-      if: ${{ inputs.issues-closed }}
-      uses: alorel-actions/semantic-release-lite/notify@v0
-      with:
-        tag: ${{ inputs.version }}
-        issues: ${{ inputs.issues-closed }}
-        allow-out-of-sync: true
diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
deleted file mode 100644
index a5c4677..0000000
--- a/.github/workflows/_test.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Test
-on:
-  workflow_call: {}
-
-permissions:
-  contents: read
-
-env:
-  CARGO_INCREMENTAL: 0
-  RUSTFLAGS: --deny warnings
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Init toolchain
-        uses: alorel-actions/cargo/init@v1
-        id: toolchain
-        with:
-          components: rustfmt,clippy
-          cache-prefix: lint
-          local: true
-
-      - name: Fmt
-        run: cargo fmt --check
-
-      - name: Clippy
-        run: cargo clippy --workspace --tests
-
-      - name: Doc
-        run: cargo doc --workspace --no-deps
-
-  test:
-    name: Test on ${{matrix.toolchain}}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        toolchain:
-          - nightly-2024-07-25
-          - stable
-          - 1.74.0
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Init toolchain
-        uses: alorel-actions/cargo/init@v1
-        with:
-          toolchain: ${{matrix.toolchain}}
-          cache-prefix: test
-          local: true
-
-      - name: Install wasm-pack
-        uses: alorel-actions/cargo-global-dep@v1
-        with:
-          name: wasm-pack
-          version: 0.13.0
-
-      - name: Test (no features)
-        run: wasm-pack test --headless --firefox --chrome --locked --no-default-features
-
-      - name: Test (default features)
-        run: wasm-pack test --headless --firefox --chrome --locked
-
-      - name: Test (nightly)
-        run: wasm-pack test --headless --firefox --chrome --locked --all-features
-        if: ${{startsWith(matrix.toolchain, 'nightly')}}
diff --git a/.github/workflows/inc/unit-test.yml b/.github/workflows/inc/unit-test.yml
new file mode 100644
index 0000000..d0b5ec1
--- /dev/null
+++ b/.github/workflows/inc/unit-test.yml
@@ -0,0 +1,59 @@
+name: Unit test
+on:
+  workflow_call:
+    inputs:
+      toolchain:
+        description: Rust version
+        default: stable
+        type: string
+      os:
+        description: OS to run on
+        default: ubuntu-latest
+        type: string
+      flags:
+        description: cli args
+        type: string
+
+permissions:
+  contents: read
+
+env:
+  CARGO_INCREMENTAL: 0
+  RUSTFLAGS: --deny warnings
+
+jobs:
+  test:
+    name: Test with ${{ inputs.flags || 'no flags' }} on ${{ inputs.os }}, ${{ inputs.toolchain }}
+    runs-on: ${{ inputs.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Init toolchain
+        uses: alorel-actions/cargo/init@v1
+        with:
+          toolchain: ${{ inputs.toolchain }}
+          cache-prefix: test
+          cache-suffix: ${{inputs.flags}}
+          local: true
+
+      - name: Build
+        run: cargo build --locked ${{ inputs.flags }}
+
+      - name: Install wasm-pack
+        uses: alorel-actions/cargo-global-dep@v1
+        with:
+          name: wasm-pack
+          version: 0.13.0
+
+      - name: Test (Chrome)
+        if: ${{ runner.os != 'macOS' }}
+        run: wasm-pack test --chrome --headless --locked ${{ inputs.flags }}
+
+      - name: Test (Firefox)
+        if: ${{ runner.os != 'macOS' }}
+        run: wasm-pack test --firefox --headless --locked ${{ inputs.flags }}
+
+      - name: Test (Safari)
+        if: ${{ runner.os == 'macOS' }}
+        run: wasm-pack test --safari --headless --locked ${{ inputs.flags }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 08e301e..a673e3b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,7 @@
 name: Release
 concurrency: release
 on:
-  workflow_dispatch: {}
+  workflow_dispatch: { }
 
 permissions:
   contents: read
@@ -13,14 +13,38 @@ env:
 jobs:
   test:
     name: Test
-    uses: ./.github/workflows/_test.yml
+    uses: ./.github/workflows/test.yml
+    with:
+      is-workflow-call: true
 
-  release:
-    name: Release
+  prepare:
+    name: Set up
+    runs-on: ubuntu-latest
+    outputs:
+      release-type: ${{ steps.changelog.outputs.release-type }}
+      version: ${{ steps.changelog.outputs.version }}
+      issues-closed: ${{ steps.changelog.outputs.issues-closed }}
+      changelog: ${{ steps.changelog.outputs.changelog }}
+      should-release: ${{ steps.changelog.outputs.should-release }}
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Generate changelog
+        id: changelog
+        uses: ./.github/actions/changelog
+
+  git:
+    name: Git release
+    runs-on: ubuntu-latest
     needs:
       - test
-    runs-on: ubuntu-latest
-    environment: crates-io
+      - prepare
+    if: ${{ needs.prepare.outputs.should-release }}
+    environment: github
     permissions:
       contents: write
     steps:
@@ -31,37 +55,63 @@ jobs:
           fetch-tags: true
           token: ${{ secrets.GH_TOKEN }}
 
-      - name: Parse
-        id: parse
-        uses: alorel-actions/semantic-release-lite@v0
+      - name: Git identity
+        uses: alorel-actions/git-ident@v1
+
+      - name: Init toolchain
+        uses: alorel-actions/cargo/init@v1
+        with:
+          cache-prefix: release
+
+      - name: cargo-bump
+        uses: alorel-actions/cargo/bump@v1
+        with:
+          release-type: ${{ needs.prepare.outputs.release-type }}
+
+      - name: Git release
+        uses: alorel-actions/cargo/release-git@v1
         with:
-          stay-at-zero: true
-          minor-types: |
-            feat: Features
-          patch-types: |
-            fix: Bug Fixes
-          trivial-types: |
-            chore: Maintenance
-            deps: Dependency updates
-            ci: CI & Build
-            build: CI & Build
-            refactor: Refactors
-            docs: Documentation
-            perf: Performance
+          version: ${{ needs.prepare.outputs.version }}
+          changelog: ${{ needs.prepare.outputs.changelog }}
 
-      - name: Prep release
-        if: ${{ steps.parse.outputs.should-release }}
-        id: prep
-        uses: ./.github/actions/prep-release
+  release:
+    name: Crate release
+    needs:
+      - git
+    if: ${{ needs.prepare.outputs.should-release }}
+    runs-on: ubuntu-latest
+    environment: crates-io
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout
         with:
-          release-type: ${{ steps.parse.outputs.release-type }}
-          version: ${{ steps.parse.outputs.next-version }}
+          fetch-tags: true
+          ref: ${{ needs.prepare.outputs.version }}
 
-      - name: Release
-        if: ${{ steps.prep.outputs.in-sync }}
-        uses: ./.github/actions/release
+      - name: Init toolchain
+        uses: alorel-actions/cargo/init@v1
+        with:
+          cache-prefix: release
+
+      - name: Publish crate
+        run: cargo publish --locked --token ${{ secrets.CRATES_IO_TOKEN }}
+
+  notify:
+    name: Notify closed issues
+    needs:
+      - release
+      - prepare
+    if: ${{ needs.prepare.outputs.should-release && needs.prepare.outputs.issues-closed }}
+    runs-on: ubuntu-latest
+    environment: github
+    permissions:
+      contents: write
+    steps:
+      - name: Notify
+        if: ${{ needs.prepare.outputs.issues-closed }}
+        uses: alorel-actions/semantic-release-lite/notify@v0
         with:
-          version: ${{ steps.parse.outputs.next-version }}
-          changelog: ${{ steps.parse.outputs.changelog }}
-          issues-closed: ${{ steps.parse.outputs.issues-closed }}
-          crates-io-token: ${{ secrets.CRATES_IO_TOKEN }}
+          tag: ${{ needs.prepare.outputs.version }}
+          issues: ${{ needs.prepare.outputs.issues-closed }}
+          allow-out-of-sync: true
+          gh-token: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 943b239..fd735f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,10 @@
 name: Test
 on:
+  workflow_call:
+    inputs:
+      is-workflow-call:
+        type: boolean
+        required: true
   push:
     branches:
       - master
@@ -28,7 +33,118 @@ env:
   CARGO_INCREMENTAL: 0
   RUSTFLAGS: --deny warnings
 
+concurrency:
+  group: test-${{ github.ref }}
+  cancel-in-progress: ${{ !inputs.is-workflow-call }}
+
 jobs:
-  test:
-    name: Test
-    uses: ./.github/workflows/_test.yml
+  doc:
+    name: Doc build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Init toolchain
+        uses: alorel-actions/cargo/init@v1
+        id: toolchain
+        with:
+          toolchain: nightly-2024-09-29
+          cache-prefix: doc
+          local: true
+
+      - name: Doc
+        run: cargo doc --workspace --all-features --no-deps
+        env:
+          RUSTDOCFLAGS: --cfg doc_cfg --deny warnings
+
+      - name: Cleanup
+        run: rm -rf target/doc
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Init toolchain
+        uses: alorel-actions/cargo/init@v1
+        id: toolchain
+        with:
+          components: rustfmt,clippy
+          cache-prefix: lint
+          local: true
+
+      - name: Fmt
+        run: cargo fmt --check
+
+      - name: Clippy
+        run: cargo clippy --workspace --tests --all-features --locked --no-deps
+
+  environment:
+    name: Environment test for ${{ matrix.toolchain }} on ${{ matrix.os }}
+    uses: ./.github/workflows/inc/unit-test.yml
+    with:
+      toolchain: ${{ matrix.toolchain }}
+      os: ${{ matrix.os }}
+      flags: --all-features
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - toolchain: nightly-2024-09-29
+            os: ubuntu-latest
+          - toolchain: 1.75.0
+            os: ubuntu-latest
+          - toolchain: stable
+            os: ubuntu-latest
+          - toolchain: stable
+            os: macos-latest
+
+  feature:
+    name: Feature test for ${{ matrix.flags || 'no flags' }}
+    uses: ./.github/workflows/inc/unit-test.yml
+    with:
+      flags: ${{ matrix.flags }}
+    strategy:
+      fail-fast: false
+      matrix:
+        flags:
+          - ''
+          - --features cursors
+          - --features dates
+          - --features indices
+          - --features list-databases
+          - --features serde
+          - --features "cursors streams"
+          - --features switch
+          - --features typed-arrays
+          - --features "typed-arrays serde"
+          - --features "cursors streams serde"
+          - --features "indices serde"
+          - --features "indices cursors"
+          - --features "indices cursors serde"
+          - --features "indices cursors streams"
+          - --features "indices cursors streams serde"
+          - --features "dates serde"
+          - --features "cursors serde"
+
+  done:
+    name: All tests
+    runs-on: ubuntu-latest
+    needs:
+      - doc
+      - lint
+      - feature
+      - environment
+    steps:
+      - uses: actions/checkout@v4
+        name: Checkout
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Generate changelog
+        id: changelog
+        uses: ./.github/actions/changelog
diff --git a/.gitignore b/.gitignore
index 494026c..1037032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.log
 /target
 /tmp.js
+/examples/adhoc.rs
diff --git a/.idea/dictionaries/.gitignore b/.idea/dictionaries/.gitignore
new file mode 100644
index 0000000..9546a67
--- /dev/null
+++ b/.idea/dictionaries/.gitignore
@@ -0,0 +1,2 @@
+/*.xml
+!/default_user.xml
diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
new file mode 100644
index 0000000..c8135ce
--- /dev/null
+++ b/.idea/dictionaries/default_user.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="default.user">
+    <words>
+      <w>bindgen</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/indexed_db.iml b/.idea/indexed_db.iml
index d990dbf..9a0ec41 100644
--- a/.idea/indexed_db.iml
+++ b/.idea/indexed_db.iml
@@ -2,7 +2,11 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/internal_macros/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
@@ -11,4 +15,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Sync_readme.xml b/.idea/runConfigurations/Sync_readme.xml
deleted file mode 100644
index 5bef6ce..0000000
--- a/.idea/runConfigurations/Sync_readme.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Sync readme" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="rdme --force --intralinks-strip-links" />
-    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
-    <option name="emulateTerminal" value="true" />
-    <option name="channel" value="DEFAULT" />
-    <option name="requiredFeatures" value="false" />
-    <option name="allFeatures" value="false" />
-    <option name="withSudo" value="false" />
-    <option name="buildTarget" value="REMOTE" />
-    <option name="backtrace" value="NO" />
-    <envs />
-    <option name="isRedirectInput" value="false" />
-    <option name="redirectInputPath" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/build.xml
similarity index 76%
rename from .idea/runConfigurations/Build.xml
rename to .idea/runConfigurations/build.xml
index c20fe0a..758cb33 100644
--- a/.idea/runConfigurations/Build.xml
+++ b/.idea/runConfigurations/build.xml
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="build --workspace --target wasm32-unknown-unknown --future-incompat-report" />
+  <configuration default="false" name="build" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="buildProfileId" value="dev" />
+    <option name="command" value="build --target wasm32-unknown-unknown --future-incompat-report --all-features" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs />
     <option name="emulateTerminal" value="true" />
diff --git a/.idea/runConfigurations/build_tests.xml b/.idea/runConfigurations/build_tests.xml
new file mode 100644
index 0000000..74a5304
--- /dev/null
+++ b/.idea/runConfigurations/build_tests.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build:tests" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="buildProfileId" value="dev" />
+    <option name="command" value="build --tests --target wasm32-unknown-unknown --future-incompat-report --all-features" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
+    <option name="emulateTerminal" value="true" />
+    <option name="channel" value="DEFAULT" />
+    <option name="requiredFeatures" value="false" />
+    <option name="allFeatures" value="false" />
+    <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
+    <option name="backtrace" value="SHORT" />
+    <option name="isRedirectInput" value="false" />
+    <option name="redirectInputPath" value="" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/build_tests_default.xml b/.idea/runConfigurations/build_tests_default.xml
new file mode 100644
index 0000000..64340f9
--- /dev/null
+++ b/.idea/runConfigurations/build_tests_default.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build:tests:default" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="buildProfileId" value="dev" />
+    <option name="command" value="build --tests --target wasm32-unknown-unknown --future-incompat-report" />
+    <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
+    <option name="emulateTerminal" value="true" />
+    <option name="channel" value="DEFAULT" />
+    <option name="requiredFeatures" value="false" />
+    <option name="allFeatures" value="false" />
+    <option name="withSudo" value="false" />
+    <option name="buildTarget" value="REMOTE" />
+    <option name="backtrace" value="SHORT" />
+    <option name="isRedirectInput" value="false" />
+    <option name="redirectInputPath" value="" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Clippy.xml b/.idea/runConfigurations/clippy.xml
similarity index 81%
rename from .idea/runConfigurations/Clippy.xml
rename to .idea/runConfigurations/clippy.xml
index 95ea093..55a0792 100644
--- a/.idea/runConfigurations/Clippy.xml
+++ b/.idea/runConfigurations/clippy.xml
@@ -1,7 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clippy" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="clippy --tests --all-features --target wasm32-unknown-unknown" />
+  <configuration default="false" name="clippy" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="clippy --workspace --tests --all-features --no-deps" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="NIGHTLY" />
     <option name="requiredFeatures" value="false" />
@@ -9,7 +10,6 @@
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
-    <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
     <method v="2">
diff --git a/.idea/runConfigurations/Clippy__fix.xml b/.idea/runConfigurations/clippy__fix.xml
similarity index 79%
rename from .idea/runConfigurations/Clippy__fix.xml
rename to .idea/runConfigurations/clippy__fix.xml
index a11c5da..3ceadb1 100644
--- a/.idea/runConfigurations/Clippy__fix.xml
+++ b/.idea/runConfigurations/clippy__fix.xml
@@ -1,7 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clippy: fix" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="clippy --tests --fix --all-features --target wasm32-unknown-unknown --allow-staged --allow-dirty" />
+  <configuration default="false" name="clippy: fix" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="clippy --tests --workspace --fix --all-features --allow-staged --allow-dirty --no-deps" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="NIGHTLY" />
     <option name="requiredFeatures" value="false" />
@@ -9,7 +10,6 @@
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
-    <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
     <method v="2">
diff --git a/.idea/runConfigurations/Doc.xml b/.idea/runConfigurations/doc.xml
similarity index 83%
rename from .idea/runConfigurations/Doc.xml
rename to .idea/runConfigurations/doc.xml
index 72ed2e8..688b17e 100644
--- a/.idea/runConfigurations/Doc.xml
+++ b/.idea/runConfigurations/doc.xml
@@ -1,7 +1,10 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Doc" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="doc --all-features --target wasm32-unknown-unknown --no-deps" />
+  <configuration default="false" name="doc" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="doc --workspace --all-features --no-deps" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs>
+      <env name="RUSTDOCFLAGS" value="--cfg doc_cfg" />
+    </envs>
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="NIGHTLY" />
     <option name="requiredFeatures" value="false" />
@@ -9,9 +12,6 @@
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
-    <envs>
-      <env name="RUSTDOCFLAGS" value="--cfg doc_cfg" />
-    </envs>
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
     <method v="2">
diff --git a/.idea/runConfigurations/Fmt.xml b/.idea/runConfigurations/fmt.xml
similarity index 91%
rename from .idea/runConfigurations/Fmt.xml
rename to .idea/runConfigurations/fmt.xml
index 401f695..1056aa1 100644
--- a/.idea/runConfigurations/Fmt.xml
+++ b/.idea/runConfigurations/fmt.xml
@@ -1,7 +1,8 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Fmt" type="CargoCommandRunConfiguration" factoryName="Cargo Command" singleton="false">
+  <configuration default="false" name="fmt" type="CargoCommandRunConfiguration" factoryName="Cargo Command" singleton="false">
     <option name="command" value="fmt --all" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
+    <envs />
     <option name="emulateTerminal" value="true" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="false" />
@@ -9,7 +10,6 @@
     <option name="withSudo" value="false" />
     <option name="buildTarget" value="REMOTE" />
     <option name="backtrace" value="SHORT" />
-    <envs />
     <option name="isRedirectInput" value="false" />
     <option name="redirectInputPath" value="" />
     <method v="2" />
diff --git a/.idea/runConfigurations/test_all.xml b/.idea/runConfigurations/test_all.xml
new file mode 100644
index 0000000..639c914
--- /dev/null
+++ b/.idea/runConfigurations/test_all.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test:all" type="ShConfigurationType" folderName="test">
+    <option name="SCRIPT_TEXT" value="wasm-pack test --headless --chrome --firefox --all-features" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/test_all_chrome.xml b/.idea/runConfigurations/test_all_chrome.xml
new file mode 100644
index 0000000..259ff86
--- /dev/null
+++ b/.idea/runConfigurations/test_all_chrome.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test:all:chrome" type="ShConfigurationType" folderName="test">
+    <option name="SCRIPT_TEXT" value="wasm-pack test --headless --chrome --all-features" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/test_all_firefox.xml b/.idea/runConfigurations/test_all_firefox.xml
new file mode 100644
index 0000000..e8f8c9b
--- /dev/null
+++ b/.idea/runConfigurations/test_all_firefox.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test:all:firefox" type="ShConfigurationType" folderName="test">
+    <option name="SCRIPT_TEXT" value="wasm-pack test --headless --firefox --all-features" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/test_default.xml b/.idea/runConfigurations/test_default.xml
new file mode 100644
index 0000000..2f43e15
--- /dev/null
+++ b/.idea/runConfigurations/test_default.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test:default" type="ShConfigurationType" folderName="test">
+    <option name="SCRIPT_TEXT" value="wasm-pack test --headless --chrome --firefox" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/bash" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 2efcdb1..8316ce6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "accessory"
-version = "1.3.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87537f9ae7cfa78d5b8ebd1a1db25959f5e737126be4d8eb44a5452fc4b63cde"
+checksum = "bb3791c4beae5b827e93558ac83a88e63a841aad61759a05d9b577ef16030470"
 dependencies = [
  "macroific",
  "proc-macro2",
@@ -14,12 +14,63 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "backtrace"
+version = "0.3.74"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -36,23 +87,56 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "console_log"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f"
+dependencies = [
+ "log",
+ "web-sys",
+]
+
 [[package]]
 name = "delegate-display"
-version = "2.1.1"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98a85201f233142ac819bbf6226e36d0b5e129a47bd325084674261c82d4cd66"
+checksum = "9926686c832494164c33a36bf65118f4bd6e704000b58c94681bf62e9ad67a74"
 dependencies = [
+ "impartial-ord",
+ "itoa",
  "macroific",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "unicode-xid",
+]
+
 [[package]]
 name = "fancy_constructor"
-version = "1.2.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f71f317e4af73b2f8f608fac190c52eac4b1879d2145df1db2fe48881ca69435"
+checksum = "fac0fd7f4636276b4bd7b3148d0ba2c1c3fbede2b5214e47e7fedb70b02cde44"
 dependencies = [
  "macroific",
  "proc-macro2",
@@ -60,6 +144,95 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -73,36 +246,84 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "impartial-ord"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab604ee7085efba6efc65e4ebca0e9533e3aff6cb501d7d77b211e3a781c6d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "indexed_db_futures"
 version = "0.5.0"
 dependencies = [
  "accessory",
  "cfg-if",
+ "console_log",
  "delegate-display",
+ "derive_more",
  "fancy_constructor",
+ "futures",
+ "futures-core",
+ "impartial-ord",
+ "indexed_db_futures_macros_internal",
  "js-sys",
+ "log",
+ "rand",
+ "sealed",
+ "serde",
+ "serde-wasm-bindgen",
+ "smallvec",
+ "thiserror",
+ "tokio",
  "uuid",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
  "web-sys",
+ "web-time",
 ]
 
+[[package]]
+name = "indexed_db_futures_macros_internal"
+version = "1.0.0"
+dependencies = [
+ "macroific",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "log"
@@ -112,9 +333,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "macroific"
-version = "1.3.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05c00ac596022625d01047c421a0d97d7f09a18e429187b341c201cb631b9dd"
+checksum = "89f276537b4b8f981bf1c13d79470980f71134b7bdcc5e6e911e910e556b0285"
 dependencies = [
  "macroific_attr_parse",
  "macroific_core",
@@ -123,32 +344,33 @@ dependencies = [
 
 [[package]]
 name = "macroific_attr_parse"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd94d5da95b30ae6e10621ad02340909346ad91661f3f8c0f2b62345e46a2f67"
+checksum = "ad4023761b45fcd36abed8fb7ae6a80456b0a38102d55e89a57d9a594a236be9"
 dependencies = [
- "cfg-if",
  "proc-macro2",
  "quote",
+ "sealed",
  "syn",
 ]
 
 [[package]]
 name = "macroific_core"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13198c120864097a565ccb3ff947672d969932b7975ebd4085732c9f09435e55"
+checksum = "d0a7594d3c14916fa55bef7e9d18c5daa9ed410dd37504251e4b75bbdeec33e3"
 dependencies = [
  "proc-macro2",
  "quote",
+ "sealed",
  "syn",
 ]
 
 [[package]]
 name = "macroific_macro"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c9853143cbed7f1e41dc39fee95f9b361bec65c8dc2a01bf609be01b61f5ae"
+checksum = "4da6f2ed796261b0a74e2b52b42c693bb6dee1effba3a482c49592659f824b3b"
 dependencies = [
  "macroific_attr_parse",
  "macroific_core",
@@ -157,63 +379,287 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "minicov"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169"
+dependencies = [
+ "cc",
+ "walkdir",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "object"
+version = "0.36.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
+[[package]]
+name = "sealed"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-wasm-bindgen"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b"
+dependencies = [
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "syn"
-version = "2.0.72"
+version = "2.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "198514704ca887dd5a1e408c6c6cdcba43672f9b4062e1b24aa34e74e6d7faae"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio"
+version = "1.40.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+dependencies = [
+ "backtrace",
+ "pin-project-lite",
+ "tokio-macros",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 dependencies = [
  "getrandom",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -222,19 +668,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -247,9 +694,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -259,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -269,9 +716,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -282,18 +729,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.3.42"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426"
 dependencies = [
  "console_error_panic_hook",
  "js-sys",
+ "minicov",
  "scoped-tls",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -302,9 +750,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
+checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -313,10 +761,124 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
 dependencies = [
  "js-sys",
+ "serde",
  "wasm-bindgen",
 ]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 75dce34..4e4fa2a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,81 +1,152 @@
+[workspace]
+resolver = "2"
+members = [
+  ".",
+  "internal_macros",
+]
+
 [package]
 name = "indexed_db_futures"
 version = "0.5.0"
-authors = ["Arturas Molcanovas <amolc@protonmail.com>"]
+authors = ["Arturas Molcanovas <amolc@pm.me>"]
 edition = "2021"
-rust-version = "1.64.0"
+rust-version = "1.75.0"
 license = "MIT"
 description = "Future bindings for IndexedDB via web_sys"
 repository = "https://github.com/Alorel/rust-indexed-db"
 keywords = ["wasm", "indexeddb", "future", "webassembly", "idb"]
 categories = ["asynchronous", "database", "wasm", "web-programming"]
 include = [
-    "src/",
-    "Cargo.toml",
-    "README.md"
-]
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = [
-    "--cfg",
-    "doc_cfg",
+  "src/",
+  "Cargo.toml",
+  "README.md"
 ]
 
 [features]
-default = [
-    "cursors",
-    "indices"
-]
 cursors = [
-    "web-sys/IdbCursor",
-    "web-sys/IdbCursorWithValue",
-    "web-sys/IdbCursorDirection"
+  "web-sys/IdbCursor",
+  "web-sys/IdbCursorWithValue",
+  "web-sys/IdbCursorDirection",
+]
+dates = [
+  "dep:web-time",
+  "_serialise-deserialise-dyn",
 ]
 indices = [
-    "web-sys/IdbIndex",
-    "web-sys/IdbIndexParameters"
+  "web-sys/IdbIndex",
+  "web-sys/IdbIndexParameters",
+]
+list-databases = [
+  "dep:impartial-ord",
+]
+serde = [
+  "dep:serde",
+  "dep:serde-wasm-bindgen",
+  "smallvec/serde",
+  "web-time/serde",
+]
+streams = [
+  "dep:futures-core",
 ]
-nightly = []
+switch = []
+typed-arrays = []
+version-change = ["tokio/macros"]
+_serialise-deserialise-dyn = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
 crate-type = ["lib"]
 
-[dev-dependencies]
-wasm-bindgen-test = "0.3.42"
+[workspace.dependencies]
+accessory = { version = "2" }
+cfg-if = "1"
+console_log = "1"
+delegate-display = { version = "3" }
+derive_more = { version = "1", default-features = false }
+fancy_constructor = { version = "2" }
+futures = "0.3.30"
+futures-core = "0.3"
+impartial-ord = "1.0.6"
+js-sys = "0.3.72"
+log = "0.4.22"
+macroific = { version = "2" }
+rand = "0.8"
+sealed = "0.6"
+serde = "1"
+serde-wasm-bindgen = "0.6"
+smallvec = "1.13"
+thiserror = "1"
+tokio = { version = "1.30", default-features = false }
+uuid = "1.8"
+wasm-bindgen = "0.2.95"
+wasm-bindgen-futures = "0.4.45"
+wasm-bindgen-test = "0.3.45"
+web-time = "1.1"
+web-sys = "0.3.72"
+
+proc-macro2 = "1"
+quote = "1"
+syn = "2"
 
 [dependencies]
-accessory = "1"
-cfg-if = "1"
-delegate-display = "2"
-fancy_constructor = "1.2"
-js-sys = "0.3.64"
-uuid = {version = "1.8", features = ["v4", "js"]}
-wasm-bindgen = "0.2.92"
-wasm-bindgen-futures = "0.4"
+accessory = { workspace = true }
+cfg-if = { workspace = true }
+delegate-display = { workspace = true }
+derive_more = { workspace = true, features = ["as_ref", "from", "deref", "deref_mut", "into", "debug"], default-features = false }
+fancy_constructor = { workspace = true }
+futures-core = { workspace = true, optional = true }
+impartial-ord = { workspace = true, optional = true }
+js-sys = { workspace = true }
+sealed = { workspace = true }
+serde = { workspace = true, optional = true }
+smallvec = { workspace = true }
+serde-wasm-bindgen = { workspace = true, optional = true }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["sync"], default-features = false }
+wasm-bindgen = { workspace = true }
+wasm-bindgen-futures = { workspace = true }
+web-time = { workspace = true, optional = true }
+
+[dependencies.internal_macros]
+version = "1"
+package = "indexed_db_futures_macros_internal"
+path = "internal_macros"
 
 [dependencies.web-sys]
-version = "0.3.64"
+workspace = true
 features = [
-    "DomException",
-    "DomStringList",
-    "Event",
-    "EventTarget",
-    "IdbDatabase",
-    "IdbFactory",
-    "IdbObjectStore",
-    "IdbObjectStoreParameters",
-    "IdbOpenDbRequest",
-    "IdbKeyRange",
-    "IdbRequest",
-    "IdbRequestReadyState",
-    "IdbTransaction",
-    "IdbTransactionMode",
-    "IdbVersionChangeEvent",
-    "Window",
-    "WorkerGlobalScope",
+  "console",
+  "DomException",
+  "DomStringList",
+  "Event",
+  "EventTarget",
+  "IdbDatabase",
+  "IdbFactory",
+  "IdbObjectStore",
+  "IdbObjectStoreParameters",
+  "IdbRequestReadyState",
+  "IdbOpenDbRequest",
+  "IdbKeyRange",
+  "IdbRequest",
+  "IdbTransaction",
+  "IdbTransactionMode",
+  "IdbVersionChangeEvent",
+  "Window",
+  "WorkerGlobalScope",
 ]
 
+[dev-dependencies]
+console_log = { workspace = true }
+futures = { workspace = true }
+impartial-ord = { workspace = true }
+log = { workspace = true }
+rand = { workspace = true }
+uuid = { workspace = true, features = ["v4", "js"] }
+wasm-bindgen-test = { workspace = true }
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "doc_cfg"]
+
 [lints.rust]
-unexpected_cfgs = { level = "deny", check-cfg = ['cfg(doc_cfg)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(doc_cfg)'] }
diff --git a/README.md b/README.md
index 908d8b9..84bbe89 100644
--- a/README.md
+++ b/README.md
@@ -1,87 +1,95 @@
-# Indexed DB Futures
-
-<!-- cargo-rdme start -->
-
 Wraps the [web_sys](https://crates.io/crates/web_sys) Indexed DB API in a Future-based API and
-removes the pain of dealing with Javascript callbacks in Rust.
+removes the pain of dealing with JS callbacks or `JSValue` in Rust.
 
 [![master CI badge](https://github.com/Alorel/rust-indexed-db/actions/workflows/test.yml/badge.svg)](https://github.com/Alorel/rust-indexed-db/actions/workflows/test.yml)
 [![crates.io badge](https://img.shields.io/crates/v/indexed_db_futures)](https://crates.io/crates/indexed_db_futures)
 [![docs.rs badge](https://img.shields.io/docsrs/indexed_db_futures?label=docs.rs)](https://docs.rs/indexed_db_futures)
 [![dependencies badge](https://img.shields.io/librariesio/release/cargo/indexed_db_futures)](https://libraries.io/cargo/indexed_db_futures)
 
-### Overall API design
-
-In most cases API methods will return a `Result` containing a wrapped
-`IdbRequest` that implements `IntoFuture`, such as
-`VoidRequest`, or, when more appropriate, the `Future`
-directly, e.g. `CountFuture`.
-
-The key difference between a wrapped Request and Future is that Requests don't have _any_ event
-listeners attached, which aims to make quickfire operations such as inserting several records
-into an `IdbObjectStore` a little bit more efficient.
+Goals & features:
 
-### Features
+- **Shield you from having to interact with [`web_sys`](https://crates.io/crates/web-sys) or
+  [`js_sys`](https://crates.io/crates/js-sys) APIs** - this should feel like a native Rust API.
+- **Integrate with [`serde`](https://crates.io/crates/serde), but don't require it** - as a rule of thumb, you'll use
+  `serde`-serialisable types when working with JS objects & bypass `serde` for Javascript primitives.
+- **Implement [`Stream`](https://docs.rs/futures/0.3.31/futures/prelude/trait.Stream.html) where applicable** - cursors
+  and key cursors have this at the time of writing.
+- **Implement a more Rust-oriented API** - for example, transactions will roll back by default unless explicitly
+  committed to allow you to use `?`s.
 
-The library can ship without cursor or index support for apps that just need a simple key-value
-store akin to `localStorage`.
+Non-goals:
 
-- `cursors` - Enable cursor support
-- `indices` - Enable index support
-- `nightly` - Use unsafe nightly features where appropriate, such as [`unwrap_unchecked`](Option::unwrap_unchecked).
-- `default`:
-   - `cursors`
-   - `indices`
-
-### Examples
-
-#### Connecting to a DB and doing basic CRUD
-
-Variable types included for clarity.
+- Becoming a feature-rich `IndexedDB` framework - this library only provides Rust-friendly access to the `IndexedDB`
+  API & integrates with some standard libraries in the ecosystem.
 
 ```rust
+use indexed_db_futures::database::Database;
 use indexed_db_futures::prelude::*;
-
-pub async fn example() -> Result<(), DomException> {
-    // Open my_db v1
-    let mut db_req: OpenDbRequest = IdbDatabase::open_u32("my_db", 1)?;
-    db_req.set_on_upgrade_needed(Some(|evt: &IdbVersionChangeEvent| -> Result<(), JsValue> {
-        // Check if the object store exists; create it if it doesn't
-        if let None = evt.db().object_store_names().find(|n| n == "my_store") {
-            evt.db().create_object_store("my_store")?;
+use indexed_db_futures::transaction::TransactionMode;
+
+#[derive(serde::Serialize, serde::Deserialize)]
+struct MySerdeType(u8, String);
+
+async fn main() -> indexed_db_futures::OpenDbResult<()> {
+    let db = Database::open("my_db")
+        .with_version(2u8)
+        .with_on_upgrade_needed(|event, db| {
+            match (event.old_version(), event.new_version()) {
+                (0.0, Some(1.0)) => {
+                    db.create_object_store("my_store")
+                        .with_auto_increment(true)
+                        .build()?;
+                }
+                (prev, Some(2.0)) => {
+                    if prev == 1.0 {
+                        let _ = db.delete_object_store("my_store");
+                    }
+
+                    db.create_object_store("my_other_store").build()?;
+                }
+                _ => {}
+            }
+
+            Ok(())
+        })
+        .await?;
+
+    // Populate some data
+    let transaction = db
+        .transaction("my_other_store")
+        .with_mode(TransactionMode::Readwrite)
+        .build()?;
+
+    let store = transaction.object_store("my_other_store")?;
+
+    store
+        .put("a primitive value that doesn't need serde")
+        .await?;
+
+    // awaiting individual requests is optional - they still go out
+    store.put(MySerdeType(10, "foos".into())).serde()?;
+
+    // Unlike JS, transactions ROLL BACK INSTEAD OF COMMITTING BY DEFAULT
+    transaction.commit().await?;
+
+    // Read some data
+    let transaction = db.transaction("my_other_store").build()?;
+    let store = transaction.object_store("my_other_store")?;
+    let Some(mut cursor) = store.open_cursor().await? else {
+        // `None` is returned if the cursor is empty
+        return Ok(());
+    };
+
+    loop {
+        match cursor.next_record_ser::<MySerdeType>().await {
+            Ok(Some(record)) => handle_record(record),
+            Ok(None) => break,
+            Err(e) => handle_error(e),
         }
-        Ok(())
-    }));
-
-    let db: IdbDatabase = db_req.await?;
-
-    // Insert/overwrite a record
-    let tx: IdbTransaction = db
-      .transaction_on_one_with_mode("my_store", IdbTransactionMode::Readwrite)?;
-    let store: IdbObjectStore = tx.object_store("my_store")?;
-
-    let value_to_put: JsValue = get_some_js_value();
-    store.put_key_val_owned("my_key", &value_to_put)?;
-
-    // IDBTransactions can have an Error or an Abort event; into_result() turns both into a
-    // DOMException
-    tx.await.into_result()?;
-
-    // Delete a record
-    let tx = db.transaction_on_one_with_mode("my_store", IdbTransactionMode::Readwrite)?;
-    let store = tx.object_store("my_store")?;
-    store.delete_owned("my_key")?;
-    tx.await.into_result()?;
-
-    // Get a record
-    let tx = db.transaction_on_one("my_store")?;
-    let store = tx.object_store("my_store")?;
-
-    let value: Option<JsValue> = store.get_owned("my_key")?.await?;
-    use_value(value);
+    }
 
     Ok(())
 }
 ```
 
-<!-- cargo-rdme end -->
+Head over to the docs for a proper introduction!
diff --git a/internal_macros/Cargo.toml b/internal_macros/Cargo.toml
new file mode 100644
index 0000000..491eac5
--- /dev/null
+++ b/internal_macros/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "indexed_db_futures_macros_internal"
+version = "1.0.0"
+edition = "2021"
+license = "MIT"
+authors = ["Arturas Molcanovas <amolc@pm.me>"]
+description = "Internal macros for the `indexed_db_futures` crate"
+keywords = []
+categories = []
+
+[lib]
+proc-macro = true
+
+[dependencies]
+macroific = { workspace = true, features = ["attr_parse", "attributed", "generic-impl", "module-prefix"] }
+proc-macro2 = { workspace = true }
+quote = { workspace = true }
+syn = { workspace = true, features = ["full"] }
diff --git a/internal_macros/README.md b/internal_macros/README.md
new file mode 100644
index 0000000..b85714b
--- /dev/null
+++ b/internal_macros/README.md
@@ -0,0 +1,2 @@
+Internal macros for the [indexed_db_futures](https://crates.io/crates/indexed_db_futures) crate. The API is to be
+considered unstable and subject to breaking changes at any time, although these will follow semver.
diff --git a/internal_macros/src/build_into_fut.rs b/internal_macros/src/build_into_fut.rs
new file mode 100644
index 0000000..1da6426
--- /dev/null
+++ b/internal_macros/src/build_into_fut.rs
@@ -0,0 +1,66 @@
+use macroific::elements::module_prefix::RESULT;
+use macroific::elements::ModulePrefix;
+use proc_macro2::{Ident, TokenStream};
+use quote::quote;
+use syn::parse::{Parse, ParseStream};
+use syn::{parse_quote, DeriveInput, GenericParam, Generics, WherePredicate};
+
+const UNPIN: ModulePrefix<'static, 3> = ModulePrefix::new(["core", "marker", "Unpin"]);
+const BUILD: ModulePrefix<'static, 3> =
+    ModulePrefix::new(["crate", "build", "Build"]).with_leading_sep(false);
+
+const MB_ERR: ModulePrefix<'static, 3> =
+    ModulePrefix::new(["crate", "future", "MaybeErrored"]).with_leading_sep(false);
+
+pub(crate) struct BuildIntoFut {
+    ident: Ident,
+
+    generics: Generics,
+}
+
+impl Parse for BuildIntoFut {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let DeriveInput {
+            ident, generics, ..
+        } = input.parse()?;
+        Ok(Self { ident, generics })
+    }
+}
+
+impl BuildIntoFut {
+    pub fn into_token_stream(self) -> TokenStream {
+        let Self { ident, generics } = self;
+        let mut gen2 = generics.clone();
+
+        gen2.params.extend::<[GenericParam; 3]>([
+            parse_quote!(_pFut),
+            parse_quote!(_pOut),
+            parse_quote!(_pErr),
+        ]);
+
+        gen2.make_where_clause().predicates.extend::<[WherePredicate; 3]>([
+            parse_quote!(Self: #BUILD<Ok = _pFut, Err = _pErr>),
+            parse_quote!(_pFut: crate::future::PollUnpinned<Output = #RESULT<_pOut, _pErr>> + #UNPIN),
+            parse_quote!(_pErr: #UNPIN)
+        ]);
+
+        let (_, g2, _) = generics.split_for_impl();
+        let (g1, _, g3) = gen2.split_for_impl();
+
+        quote! {
+            #[automatically_derived]
+            impl #g1 ::std::future::IntoFuture for #ident #g2 #g3 {
+                type Output = #RESULT<_pOut, _pErr>;
+                type IntoFuture = #MB_ERR<_pFut, _pErr>;
+
+                #[inline]
+                fn into_future(self) -> Self::IntoFuture {
+                    match #BUILD::build(self) {
+                        Ok(fut) => #MB_ERR::running(fut),
+                        Err(e) => #MB_ERR::errored(e),
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/internal_macros/src/commons/fn_target.rs b/internal_macros/src/commons/fn_target.rs
new file mode 100644
index 0000000..3b781d9
--- /dev/null
+++ b/internal_macros/src/commons/fn_target.rs
@@ -0,0 +1,45 @@
+use proc_macro2::TokenStream;
+use quote::ToTokens;
+use syn::parse::{Parse, ParseStream};
+use syn::{Generics, ItemFn, ItemImpl};
+
+pub(crate) enum FnTarget {
+    Fn(ItemFn),
+    Impl(ItemImpl),
+}
+
+impl Parse for FnTarget {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        if input.fork().parse::<ItemFn>().is_ok() {
+            input.parse().map(FnTarget::Fn)
+        } else {
+            input.parse().map(FnTarget::Impl)
+        }
+    }
+}
+
+impl FnTarget {
+    #[must_use]
+    pub fn generics_mut(&mut self) -> &mut Generics {
+        match self {
+            Self::Fn(v) => &mut v.sig.generics,
+            Self::Impl(v) => &mut v.generics,
+        }
+    }
+}
+
+impl ToTokens for FnTarget {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        match self {
+            Self::Fn(v) => v.to_tokens(tokens),
+            Self::Impl(v) => v.to_tokens(tokens),
+        }
+    }
+
+    fn into_token_stream(self) -> TokenStream {
+        match self {
+            Self::Fn(v) => v.into_token_stream(),
+            Self::Impl(v) => v.into_token_stream(),
+        }
+    }
+}
diff --git a/internal_macros/src/commons/mod.rs b/internal_macros/src/commons/mod.rs
new file mode 100644
index 0000000..6469d5b
--- /dev/null
+++ b/internal_macros/src/commons/mod.rs
@@ -0,0 +1,3 @@
+pub(crate) use fn_target::FnTarget;
+
+mod fn_target;
diff --git a/internal_macros/src/errdoc.rs b/internal_macros/src/errdoc.rs
new file mode 100644
index 0000000..1ffa067
--- /dev/null
+++ b/internal_macros/src/errdoc.rs
@@ -0,0 +1,70 @@
+use macroific::elements::Attributed;
+use proc_macro2::TokenStream;
+use quote::ToTokens;
+use syn::parse::{Parse, ParseStream};
+use syn::punctuated::Punctuated;
+use syn::{parse_quote, Token};
+
+use namespace::Namespace;
+
+use crate::TokenStream1;
+
+mod namespace;
+
+type PNamespace = Punctuated<Namespace, Token![,]>;
+
+pub(crate) struct Errdoc {
+    namespaces: PNamespace,
+    attr_stream: Attributed,
+}
+
+#[repr(transparent)]
+struct DefVec(PNamespace);
+
+impl Parse for DefVec {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        PNamespace::parse_terminated(input).map(Self)
+    }
+}
+
+impl Errdoc {
+    #[inline]
+    #[must_use]
+    pub fn exec(defs: TokenStream1, mut function: TokenStream1) -> TokenStream1 {
+        match syn::parse::<DefVec>(defs) {
+            Ok(defs) => match syn::parse(function) {
+                Ok(attr_stream) => Self {
+                    namespaces: defs.0,
+                    attr_stream,
+                }
+                .into_token_stream(),
+                Err(e) => e.into_compile_error(),
+            }
+            .into(),
+            Err(e) => {
+                let e = TokenStream1::from(e.into_compile_error());
+                function.extend(e);
+                function
+            }
+        }
+    }
+
+    fn into_token_stream(self) -> TokenStream {
+        let Self {
+            namespaces,
+            mut attr_stream,
+        } = self;
+
+        attr_stream.attributes.extend([
+            parse_quote!(#[doc = "\n # Errors\n"]),
+            parse_quote!(#[doc = " | Error | Thrown when |"]),
+            parse_quote!(#[doc = " |---|---|"]),
+        ]);
+
+        for namespace in namespaces {
+            namespace.extend_attrs(&mut attr_stream.attributes);
+        }
+
+        attr_stream.into_token_stream()
+    }
+}
diff --git a/internal_macros/src/errdoc/namespace.rs b/internal_macros/src/errdoc/namespace.rs
new file mode 100644
index 0000000..bf88d58
--- /dev/null
+++ b/internal_macros/src/errdoc/namespace.rs
@@ -0,0 +1,206 @@
+use syn::{parse_quote, Attribute};
+
+trait TNamespaceBase: Sized {
+    #[must_use]
+    fn try_from_str(str: &str) -> Option<Self>;
+
+    /// `[name, message]`
+    #[must_use]
+    fn name_and_msg(self) -> [&'static str; 2];
+
+    #[must_use]
+    fn msg(self) -> &'static str {
+        self.name_and_msg()[1]
+    }
+}
+
+trait TNamespace: Sized {
+    fn name_and_msg(self) -> [&'static str; 2];
+
+    fn into_attr(self) -> Attribute {
+        let [name, msg] = self.name_and_msg();
+        doc_attr_line(name, msg)
+    }
+}
+
+fn doc_attr_line(name: &str, desc: &str) -> Attribute {
+    let msg = format!(" | [`{name}`](crate::error::DomException::{name}) | {desc} |");
+    parse_quote!(#[doc = #msg])
+}
+
+macro_rules! impl_namespaces {
+    ($container: ident ($($namespace: ident ( $($variant: ident ($msg: literal)),+ $(,)? )),+ $(,)?)) => {
+        pub(super) enum $container {
+            $($namespace(syn::punctuated::Punctuated<$namespace, syn::token::Comma>),)+
+        }
+
+        $(
+            #[derive(Copy, Clone)]
+            #[repr(u8)]
+            #[allow(clippy::enum_variant_names)]
+            pub(super) enum $namespace {
+                $($variant,)+
+            }
+        )+
+
+        impl ::syn::parse::Parse for $container {
+            fn parse(input: syn::parse::ParseStream) -> ::syn::Result<Self> {
+                let ident = input.parse::<proc_macro2::Ident>()?;
+                let ident_str = ident.to_string();
+
+                let contents;
+                syn::parenthesized!(contents in input);
+
+                match ident_str.as_str() {
+                    $(
+                        stringify!($namespace) => {
+                            syn::punctuated::Punctuated::parse_terminated(&contents).map($container::$namespace)
+                        },
+                    )+
+                    _ => Err(syn::Error::new(syn::spanned::Spanned::span(&ident), "Unrecognised namespace")),
+                }
+            }
+        }
+
+        impl $container {
+            pub fn extend_attrs(self, attrs: &mut Vec<syn::Attribute>) {
+                match self {
+                    $(
+                        $container::$namespace(ns) => {
+                            attrs.extend(ns.into_iter().map(TNamespace::into_attr));
+                        },
+                    )+
+                }
+            }
+        }
+
+        $(
+            impl TNamespaceBase for $namespace {
+                fn name_and_msg(self) -> [&'static str; 2] {
+                    match self {
+                        $(Self::$variant => [stringify!($variant), $msg],)+
+                    }
+                }
+
+                fn try_from_str(str: &str) -> Option<Self> {
+                    match str {
+                        $(stringify!($variant) => Some(Self::$variant),)+
+                        _ => None
+                    }
+                }
+            }
+
+            impl ::syn::parse::Parse for $namespace {
+                fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+                    let ident = input.parse::<proc_macro2::Ident>()?;
+
+                    match <$namespace as TNamespaceBase>::try_from_str(&ident.to_string()) {
+                        Some(ns) => Ok(ns),
+                        None => Err(syn::Error::new(syn::spanned::Spanned::span(&ident), "Unrecognised alias")),
+                    }
+                }
+            }
+        )+
+    };
+}
+
+macro_rules! name_msg {
+    (fwd ($($ty: ty),+ $(,)?) ) => {
+        $(impl TNamespace for $ty {
+            #[inline]
+            fn name_and_msg(self) -> [&'static str; 2] {
+                <Self as TNamespaceBase>::name_and_msg(self)
+            }
+        })+
+    };
+    ($ty: ident {
+        $($variant: ident => $name: literal),+ $(,)?
+    }) => {
+        impl TNamespace for $ty {
+            fn name_and_msg(self) -> [&'static str; 2] {
+                match self {
+                    $(Self::$variant => [$name, self.msg()],)+
+                    o => TNamespaceBase::name_and_msg(o),
+                }
+            }
+        }
+    };
+}
+
+impl_namespaces!(Namespace(
+    QuerySource(
+        InvalidStateError("Thrown if this object store or index has been deleted."),
+        TransactionInactiveError("Thrown if the transaction associated with this operation is inactive."),
+        DataError("Thrown if the key or key range provided contains an invalid key."),
+        ConstraintError("Thrown if an object store is already using the specified `name`."),
+    ),
+    Database(
+        TransactionInactiveError("Thrown if a request is made on a source database that does not exist (for example, when the database has been deleted or removed)."),
+        ConstraintError("Thrown if an object store with the given name (based on a case-sensitive comparison) already exists in the connected database."),
+
+        InvalidStateErrorObjectStore("Thrown if the method was not called from a [`Versionchange`](crate::transaction::TransactionMode::Versionchange) transaction callback."),
+        NotFoundErrorDeleteObjectStore("Thrown when trying to delete an object store that does not exist."),
+        InvalidAccessErrorCreateObjectStore("Thrown if autoIncrement is set to true and keyPath is either an empty string or an array containing an empty string."),
+
+        NotFoundErrorTx("Thrown if an object store specified cannot be found."),
+        InvalidAccessErrorTx("Thrown if the fn was called with an empty list of store names."),
+    ),
+    ObjectStore(
+        ReadOnlyError("Thrown if the transaction associated with this operation is in [`Readonly`](crate::transaction::TransactionMode::Readonly) mode."),
+        TransactionInactiveError("Thrown if the transaction associated with this operation is inactive."),
+        DataErrorAdd("See [MDN documentation](https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore/add#dataerror)."),
+        DataErrorDelete("Thrown if the key is not a valid key or key range."),
+        InvalidStateError("Thrown if the object store has been deleted or removed."),
+        DataCloneError("Thrown if the data being stored could not be cloned by the internal structured cloning algorithm."),
+        ConstraintError("Thrown if an insert operation failed because the primary key constraint was violated (due to an already existing record with the same primary key value)."),
+    ),
+    Transaction(
+        NotFoundError("Thrown if the requested object store is not in this transaction's scope."),
+        InvalidStateError("Thrown if the request was made on a source object that has been deleted or removed, or if the transaction has finished."),
+    ),
+    Index(
+        ConstraintError("Thrown if an index with the same name already exists in the database. Index names are case-sensitive."),
+        InvalidAccessError("Thrown if the provided key path is a sequence, and [`multi_entry`](crate::index::IndexParameters::multi_entry) is set to true."),
+        InvalidStateError("Thrown if the method was not called from a [`VersionChange`](crate::transaction::TransactionMode::Versionchange) transaction mode callback or the object store has been deleted."),
+        InvalidStateErrorIndex("Thrown if the object store has been deleted or removed, or if the transaction has already finished."),
+        SyntaxError("Thrown if the provided keyPath is not a [valid key path](https://www.w3.org/TR/IndexedDB/#dfn-valid-key-path)."),
+        TransactionInactiveError("Thrown if the transaction this object store belongs to is not active (e.g. has been deleted or removed)."),
+        NotFoundError("Thrown if there is no index with the given name (case-sensitive) in the database."),
+    ),
+    Cursor(
+        TransactionInactiveError("Thrown if the transaction associated with this cursor is inactive."),
+        DataErrorOpen("Thrown if the key or key range provided contains an invalid key."),
+        InvalidStateErrorOpen("Thrown if the object store or index has been deleted."),
+        InvalidStateError("Thrown if the cursor is currently being iterated or has iterated past its end."),
+        DataError("Thrown if the key is invalid, is less than the cursor's current position (if the cursor is moving forward) or is greater than the cursor's current position (if the cursor is moving backward)."),
+        DataErrorUpdate("Thrown if the underlying object store uses in-line keys and the property in the value at the object store's key path does not match the key in this cursor's position."),
+        InvalidAccessError("Thrown if the cursor's direction is not [`Prev`](crate::cursor::CursorDirection::Prev) or [`Next`](crate::cursor::CursorDirection::Next)."),
+        ReadOnlyError("Thrown if the transaction mode is [`Readonly`](crate::transaction::TransactionMode::Readonly)."),
+        DataCloneError("Thrown if the data being stored could not be cloned by the internal structured cloning algorithm.")
+    ),
+));
+
+name_msg!(fwd(QuerySource, Transaction));
+
+name_msg!(Cursor {
+    InvalidStateErrorOpen => "InvalidStateError",
+    DataErrorOpen => "DataError",
+    DataErrorUpdate => "DataError",
+});
+
+name_msg!(ObjectStore {
+    DataErrorAdd => "DataError",
+    DataErrorDelete => "DataError",
+});
+
+name_msg!(Database {
+    NotFoundErrorDeleteObjectStore => "NotFoundError",
+    InvalidAccessErrorCreateObjectStore => "InvalidAccessError",
+    InvalidStateErrorObjectStore => "InvalidStateError",
+    NotFoundErrorTx => "NotFoundError",
+    InvalidAccessErrorTx => "InvalidAccessError",
+});
+
+name_msg!(Index {
+    InvalidStateErrorIndex => "InvalidStateError",
+});
diff --git a/internal_macros/src/from_dom_exception.rs b/internal_macros/src/from_dom_exception.rs
new file mode 100644
index 0000000..4078827
--- /dev/null
+++ b/internal_macros/src/from_dom_exception.rs
@@ -0,0 +1,213 @@
+use macroific::elements::ModulePrefix;
+use macroific::prelude::*;
+use proc_macro2::{Ident, TokenStream};
+use quote::quote;
+use syn::parse::{Parse, ParseStream};
+use syn::punctuated::Punctuated;
+use syn::spanned::Spanned;
+use syn::{DeriveInput, LitStr, Token, Type};
+
+const FMT: ModulePrefix<2> = ModulePrefix::new(["core", "fmt"]);
+
+pub(crate) struct FromDomException {
+    ident: Ident,
+    variants: Vec<Variant>,
+    has_default: bool,
+}
+
+#[derive(AttributeOptions)]
+struct VariantOpts {
+    default: bool,
+}
+
+struct Variant {
+    ident: Ident,
+    opts: VariantOpts,
+}
+
+impl TryFrom<syn::Variant> for Variant {
+    type Error = syn::Error;
+
+    fn try_from(var: syn::Variant) -> Result<Self, Self::Error> {
+        let opts = VariantOpts::from_iter_named("from_dom_exception", var.span(), var.attrs)?;
+
+        let fields = var.fields.extract_unnamed_fields()?;
+        let span = fields.span();
+
+        let mut fields = fields.into_iter();
+        let Some(first) = fields.next() else {
+            return Err(syn::Error::new(span, "expected a single field"));
+        };
+
+        if let Some(next) = fields.next() {
+            return Err(syn::Error::new(next.span(), "expected a single field"));
+        }
+
+        drop(fields);
+        let span = first.span();
+        let Type::Path(p) = first.ty else {
+            return Err(syn::Error::new(span, "expected a type path"));
+        };
+
+        match p.path.segments.last() {
+            Some(last) if last.ident == "DomException" => {}
+            _ => return Err(syn::Error::new(p.span(), "expected a `DomException`")),
+        }
+
+        Ok(Self {
+            ident: var.ident,
+            opts,
+        })
+    }
+}
+
+impl Parse for FromDomException {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let DeriveInput { ident, data, .. } = input.parse()?;
+        let base_variants = data.extract_enum()?.variants;
+        let mut variants = Vec::with_capacity(base_variants.len());
+
+        let mut has_default = false;
+
+        for var in base_variants {
+            let var = Variant::try_from(var)?;
+
+            if var.opts.default {
+                if has_default {
+                    return Err(syn::Error::new_spanned(
+                        var.ident,
+                        "multiple default variants",
+                    ));
+                }
+
+                has_default = true;
+            }
+
+            variants.push(var);
+        }
+
+        Ok(Self {
+            ident,
+            variants,
+            has_default,
+        })
+    }
+}
+
+impl FromDomException {
+    #[must_use]
+    pub fn into_token_stream(self) -> TokenStream {
+        let Self {
+            ident: enum_ident,
+            variants,
+            has_default,
+        } = self;
+
+        let arms_from_base = variants.iter().filter_map(move |v| {
+            if v.opts.default {
+                return None;
+            }
+
+            let ident = &v.ident;
+            let ident_str = LitStr::new(&ident.to_string(), ident.span());
+            Some(quote!(#ident_str => Self::#ident(e),))
+        });
+
+        let arms_to_base = variants
+            .iter()
+            .map(|v| {
+                let ident = &v.ident;
+                quote!(#enum_ident::#ident(e))
+            })
+            .collect::<Punctuated<_, Token![|]>>();
+
+        let arms_name = variants.iter().map(move |v| {
+            let ident = &v.ident;
+
+            if v.opts.default {
+                quote!(Self::#ident(e) => return ::std::borrow::Cow::Owned(e.name()))
+            } else {
+                let ident_str = LitStr::new(&ident.to_string(), ident.span());
+                quote!(Self::#ident(_) => #ident_str)
+            }
+        });
+
+        let arms_fmt = variants.iter().map(move |v| {
+            let ident = &v.ident;
+
+            if v.opts.default {
+                quote! {
+                    Self::#ident(e) => {
+                        #FMT::Display::fmt(&e.to_string(), f)?;
+                        e.message()
+                    }
+                }
+            } else {
+                let ident_str = LitStr::new(&ident.to_string(), ident.span());
+                quote! {
+                    Self::#ident(e) => {
+                        f.write_str(#ident_str)?;
+                        e.message()
+                    }
+                }
+            }
+        });
+
+        let default = if has_default {
+            quote!(Self::Other(e))
+        } else {
+            quote!(Self::Unknown(e.unchecked_into()))
+        };
+
+        quote! {
+            #[automatically_derived]
+            impl #enum_ident {
+                /// Get the exception [name](::web_sys::DomException::name)
+                pub fn name(&self) -> std::borrow::Cow<str> {
+                    std::borrow::Cow::Borrowed(match self {
+                        #(#arms_name),*
+                    })
+                }
+            }
+
+            #[automatically_derived]
+            #[::sealed::sealed]
+            impl crate::internal_utils::SystemRepr for #enum_ident {
+                type Repr = ::web_sys::DomException;
+
+                fn as_sys(&self) -> &Self::Repr {
+                    match self {
+                        #arms_to_base => e,
+                    }
+                }
+
+                fn into_sys(self) -> Self::Repr {
+                    match self {
+                        #arms_to_base => e,
+                    }
+                }
+            }
+
+            #[automatically_derived]
+            impl From<::web_sys::DomException> for #enum_ident {
+                fn from(e: ::web_sys::DomException) -> Self {
+                    match e.name().as_str() {
+                        #(#arms_from_base)*
+                        _ => #default,
+                    }
+                }
+            }
+
+            #[automatically_derived]
+            impl #FMT::Display for #enum_ident {
+                fn fmt(&self, f: &mut #FMT::Formatter<'_>) -> #FMT::Result {
+                    let msg = match self {
+                        #(#arms_fmt),*
+                    };
+                    f.write_str(": ")?;
+                    f.write_str(&msg)
+                }
+            }
+        }
+    }
+}
diff --git a/internal_macros/src/generate_with.rs b/internal_macros/src/generate_with.rs
new file mode 100644
index 0000000..6a447e5
--- /dev/null
+++ b/internal_macros/src/generate_with.rs
@@ -0,0 +1,97 @@
+use std::ops::RangeTo;
+
+use proc_macro2::{Ident, TokenStream};
+use quote::ToTokens;
+use syn::parse::{Parse, ParseStream};
+use syn::spanned::Spanned;
+use syn::{parse_quote, FnArg, ItemFn, Pat, ReturnType, Token};
+
+pub struct GenerateWith {
+    func: ItemFn,
+    generated_func: ItemFn,
+}
+
+impl Parse for GenerateWith {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        const PREFIX_SET: &str = "set_";
+        const PREFIX_SET_REPLACE_RANGE: RangeTo<usize> = ..PREFIX_SET.len();
+        const REPLACEMENT: &str = "with_";
+        const E_BAD_FN: &str = "Expected a &mut self fn";
+
+        let func = input.parse::<ItemFn>()?;
+        let mut ident_str = func.sig.ident.to_string();
+
+        if !ident_str.starts_with(PREFIX_SET) {
+            return Err(syn::Error::new(
+                func.sig.ident.span(),
+                "Function name must start with 'set_'",
+            ));
+        }
+
+        ident_str.replace_range(PREFIX_SET_REPLACE_RANGE, REPLACEMENT);
+
+        let mut generated_func = func.clone();
+
+        match generated_func.sig.inputs.first_mut() {
+            Some(FnArg::Receiver(this)) => {
+                *this = parse_quote!(mut self);
+            }
+            Some(o) => return Err(syn::Error::new(o.span(), E_BAD_FN)),
+            None => return Err(syn::Error::new(generated_func.sig.span(), E_BAD_FN)),
+        }
+
+        generated_func.block = {
+            let orig_name = &func.sig.ident;
+            let mut args = Vec::with_capacity(func.sig.inputs.len() - 1);
+
+            for fn_arg in func.sig.inputs.iter().skip(1) {
+                match fn_arg {
+                    FnArg::Typed(pat) => match &*pat.pat {
+                        Pat::Ident(pat) => args.push(&pat.ident),
+                        _ => return Err(syn::Error::new(fn_arg.span(), "Expected an identifier")),
+                    },
+                    FnArg::Receiver(_) => {
+                        return Err(syn::Error::new(fn_arg.span(), "Expected an identifier"))
+                    }
+                }
+            }
+
+            parse_quote!({
+                self.#orig_name(#(#args),*);
+                self
+            })
+        };
+
+        generated_func.sig.output = {
+            let arrow = <Token![->]>::default();
+            let this = Box::new(parse_quote!(Self));
+            ReturnType::Type(arrow, this)
+        };
+        generated_func.sig.ident = Ident::new(&ident_str, func.sig.ident.span());
+
+        if !generated_func.attrs.iter().any(is_inline_attr) {
+            generated_func.attrs.push(syn::parse_quote!(#[inline]));
+        }
+
+        Ok(Self {
+            func,
+            generated_func,
+        })
+    }
+}
+
+impl ToTokens for GenerateWith {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let Self {
+            func,
+            generated_func,
+        } = self;
+
+        func.to_tokens(tokens);
+        generated_func.to_tokens(tokens);
+    }
+}
+
+fn is_inline_attr(attr: &syn::Attribute) -> bool {
+    attr.path().is_ident("inline")
+}
diff --git a/internal_macros/src/generic_bounds.rs b/internal_macros/src/generic_bounds.rs
new file mode 100644
index 0000000..d24a1da
--- /dev/null
+++ b/internal_macros/src/generic_bounds.rs
@@ -0,0 +1,77 @@
+use crate::commons::FnTarget;
+use crate::TokenStream1;
+use quote::ToTokens;
+use syn::punctuated::Punctuated;
+use syn::{parse_quote, Error, WherePredicate};
+
+#[inline]
+pub(super) fn exec(spec: TokenStream1, target: TokenStream1) -> TokenStream1 {
+    match syn::parse::<Opts>(spec) {
+        Ok(opts) => match syn::parse::<FnTarget>(target.clone()) {
+            Ok(mut target) => {
+                opts.extend_target(&mut target);
+                target.into_token_stream().into()
+            }
+            Err(e) => on_err(target, e),
+        },
+        Err(e) => on_err(target, e),
+    }
+}
+
+macro_rules! make_opts {
+    ($struct_name: ident => { $($($opt: ident)|+ => $predicate: ty),+ $(,)? }) => {
+        /// Options list
+        ///
+        /// | Option | Predicate |
+        /// |--------|-----------|
+        $($(#[doc = concat!(" | `", stringify!($opt), "` | `", stringify!($predicate), "` |")])+)+
+        #[derive(::macroific::attr_parse::AttributeOptions)]
+        pub(super) struct $struct_name {
+            $($($opt: ::syn::punctuated::Punctuated<proc_macro2::Ident, ::syn::Token![,]>),+),+
+        }
+
+        impl ::syn::parse::Parse for $struct_name {
+            #[inline]
+            fn parse(input: ::syn::parse::ParseStream) -> ::syn::Result<Self> {
+                ::macroific::attr_parse::AttributeOptions::from_stream(input)
+            }
+        }
+
+        impl $struct_name {
+            fn extend_target(self, target: &mut FnTarget) {
+                $($(if !self.$opt.is_empty() {
+                    extend_generics(self.$opt, target, ::quote::quote!($predicate));
+                })+)+
+            }
+        }
+    };
+}
+
+make_opts!(Opts => {
+    db_name|index_name|store_name|key_path => ::core::convert::AsRef<str>,
+    db_version => crate::factory::DBVersion,
+    blocked_cb => ::core::ops::FnOnce(crate::database::VersionChangeEvent) -> crate::Result<()> + 'static,
+    upgrade_cb => ::core::ops::FnOnce(crate::database::VersionChangeEvent, crate::database::Database) -> crate::Result<()> + 'static,
+});
+
+fn on_err(mut target: TokenStream1, e: Error) -> TokenStream1 {
+    let e: TokenStream1 = e.into_compile_error().into();
+    target.extend(e);
+    target
+}
+
+fn extend_generics<T, I, P>(idents: Punctuated<I, P>, target: &mut FnTarget, ext_with: T)
+where
+    T: ToTokens,
+    I: ToTokens,
+{
+    let iter = idents
+        .into_iter()
+        .map(move |id| -> WherePredicate { parse_quote!(#id: #ext_with) });
+
+    target
+        .generics_mut()
+        .make_where_clause()
+        .predicates
+        .extend(iter);
+}
diff --git a/internal_macros/src/lib.rs b/internal_macros/src/lib.rs
new file mode 100644
index 0000000..af536f3
--- /dev/null
+++ b/internal_macros/src/lib.rs
@@ -0,0 +1,93 @@
+//! Internal macros for the [indexed_db_futures](https://crates.io/crates/indexed_db_futures) crate. The API is to be
+//! considered unstable and subject to breaking changes at any time, although these will follow semver.
+
+#![deny(clippy::correctness, clippy::suspicious)]
+#![warn(
+    clippy::complexity,
+    clippy::perf,
+    clippy::style,
+    clippy::pedantic,
+    missing_docs
+)]
+#![allow(rustdoc::private_intra_doc_links)]
+
+use proc_macro::TokenStream as TokenStream1;
+
+use quote::ToTokens;
+use syn::parse_macro_input;
+
+mod commons;
+mod errdoc;
+mod from_dom_exception;
+mod struct_name;
+
+mod build_into_fut;
+mod generate_with;
+mod generic_bounds;
+mod poll_unpinned;
+mod struct_name_debug;
+
+/// Add consistent generic bounds across the crate. See [options](generic_bounds::Opts).
+#[proc_macro_attribute]
+pub fn generic_bounds(spec: TokenStream1, target: TokenStream1) -> TokenStream1 {
+    generic_bounds::exec(spec, target)
+}
+
+/// Generate a `with_` setter for a `set_` setter
+#[proc_macro_attribute]
+pub fn generate_with(_args: TokenStream1, input: TokenStream1) -> TokenStream1 {
+    parse_macro_input!(input as generate_with::GenerateWith)
+        .into_token_stream()
+        .into()
+}
+
+/// Delegate debug to inner type, wrap with type name.
+#[proc_macro_derive(StructNameDebug, attributes(debug))]
+pub fn derive_struct_name_debug(input: TokenStream1) -> TokenStream1 {
+    struct_name_debug::StructNameDebug::derive(input)
+}
+
+/// Derive a [`Future`](std::future::Future) from a `PollUnpinned`.
+#[proc_macro_derive(FutureFromPollUnpinned)]
+pub fn derive_future_from_poll_unpinned(input: TokenStream1) -> TokenStream1 {
+    poll_unpinned::DeriveFutureFromPollUnpinned::derive(input)
+}
+
+/// Derive an `IntoFuture` for variations of the type that implement `BuildPrimitive`.
+#[proc_macro_derive(BuildIntoFut)]
+pub fn derive_primitive_into_fut(input: TokenStream1) -> TokenStream1 {
+    parse_macro_input!(input as build_into_fut::BuildIntoFut)
+        .into_token_stream()
+        .into()
+}
+
+/// Derive `StructName`
+#[proc_macro_derive(StructName)]
+pub fn derive_struct_name(input: TokenStream1) -> TokenStream1 {
+    parse_macro_input!(input as struct_name::StructName)
+        .into_token_stream()
+        .into()
+}
+
+/// Implement `From<DomException>`
+#[proc_macro_derive(dom_exception_err, attributes(from_dom_exception))]
+pub fn derive_from_dom_exception(input: TokenStream1) -> TokenStream1 {
+    parse_macro_input!(input as from_dom_exception::FromDomException)
+        .into_token_stream()
+        .into()
+}
+
+/// Document the errors this fn returns
+///
+/// # Example
+///
+#[cfg_attr(doctest, doc = " ````no_test")]
+/// ```
+/// #[errdoc(
+///     InvalidStateError("Thrown when bars do a foo."),
+/// )]
+/// ````
+#[proc_macro_attribute]
+pub fn errdoc(defs: TokenStream1, function: TokenStream1) -> TokenStream1 {
+    errdoc::Errdoc::exec(defs, function)
+}
diff --git a/internal_macros/src/poll_unpinned.rs b/internal_macros/src/poll_unpinned.rs
new file mode 100644
index 0000000..7cb4b0a
--- /dev/null
+++ b/internal_macros/src/poll_unpinned.rs
@@ -0,0 +1,55 @@
+use macroific::elements::ModulePrefix;
+use proc_macro2::Ident;
+use quote::quote;
+use syn::parse::{Parse, ParseStream};
+use syn::{parse_quote, DeriveInput, Generics};
+
+const POLL_UNPINNED: ModulePrefix<'static, 3> =
+    ModulePrefix::new(["crate", "future", "PollUnpinned"]).with_leading_sep(false);
+
+#[allow(clippy::module_name_repetitions)]
+pub struct DeriveFutureFromPollUnpinned {
+    ident: Ident,
+    generics: Generics,
+}
+
+impl Parse for DeriveFutureFromPollUnpinned {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let DeriveInput {
+            ident, generics, ..
+        } = input.parse()?;
+
+        Ok(Self { ident, generics })
+    }
+}
+
+impl DeriveFutureFromPollUnpinned {
+    pub fn derive(input: crate::TokenStream1) -> crate::TokenStream1 {
+        let DeriveFutureFromPollUnpinned { ident, generics } = syn::parse_macro_input!(input);
+
+        let generics_mut = {
+            let mut generics = generics.clone();
+            generics.params.push(parse_quote!(__out));
+            generics
+        };
+        let (g1, _, _) = generics_mut.split_for_impl();
+        let (_, g2, g3) = generics.split_for_impl();
+
+        let out = quote! {
+            #[automatically_derived]
+            impl #g1 ::std::future::Future for #ident #g2 #g3
+            where
+              Self: #POLL_UNPINNED<Output = __out> + ::std::marker::Unpin,
+            {
+                type Output = __out;
+
+                #[inline]
+                fn poll(mut self: ::std::pin::Pin<&mut Self>, cx: &mut ::std::task::Context) -> ::std::task::Poll<Self::Output> {
+                    #POLL_UNPINNED::poll_unpinned(&mut *self, cx)
+                }
+            }
+        };
+
+        out.into()
+    }
+}
diff --git a/internal_macros/src/struct_name.rs b/internal_macros/src/struct_name.rs
new file mode 100644
index 0000000..9016d6d
--- /dev/null
+++ b/internal_macros/src/struct_name.rs
@@ -0,0 +1,42 @@
+use macroific::elements::{GenericImpl, ModulePrefix};
+use proc_macro2::{Ident, TokenStream};
+use quote::quote;
+use syn::parse::{Parse, ParseStream};
+use syn::{DeriveInput, Generics, LitStr};
+
+pub struct StructName {
+    ident: Ident,
+    generics: Generics,
+}
+
+impl Parse for StructName {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let input = input.parse::<DeriveInput>()?;
+
+        Ok(Self {
+            generics: input.generics,
+            ident: input.ident,
+        })
+    }
+}
+
+impl StructName {
+    #[must_use]
+    pub fn into_token_stream(self) -> TokenStream {
+        const TRAIT_NAME: ModulePrefix<'static, 3> =
+            ModulePrefix::new(["crate", "internal_utils", "StructName"]).with_leading_sep(false);
+
+        let Self { ident, generics } = self;
+
+        let str = LitStr::new(&ident.to_string(), ident.span());
+        let header = GenericImpl::new(generics)
+            .with_trait(TRAIT_NAME)
+            .with_target(ident);
+
+        quote! {
+            #header {
+                const TYPE_NAME: &'static str = #str;
+            }
+        }
+    }
+}
diff --git a/internal_macros/src/struct_name_debug.rs b/internal_macros/src/struct_name_debug.rs
new file mode 100644
index 0000000..25bfa01
--- /dev/null
+++ b/internal_macros/src/struct_name_debug.rs
@@ -0,0 +1,116 @@
+use macroific::elements::{GenericImpl, ModulePrefix};
+use macroific::prelude::*;
+use proc_macro2::{Ident, Literal, Span, TokenStream};
+use quote::{quote, ToTokens, TokenStreamExt};
+use syn::parse::{Parse, ParseStream};
+use syn::{parse_macro_input, Expr, Generics, LitStr};
+
+pub(crate) const ATTR_NAME: &str = "debug";
+const FMT: ModulePrefix<'static, 2> = ModulePrefix::new(["std", "fmt"]);
+
+pub struct StructNameDebug {
+    ident: Ident,
+    generics: Generics,
+    field_expr: TokenStream,
+}
+
+#[derive(AttributeOptions)]
+struct ContainerOpts {
+    expr: Option<Expr>,
+}
+
+impl Parse for StructNameDebug {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let syn::DeriveInput {
+            ident,
+            generics,
+            data,
+            attrs,
+            ..
+        } = input.parse()?;
+
+        let ContainerOpts { expr: field_expr } =
+            ContainerOpts::from_iter_named(ATTR_NAME, Span::call_site(), attrs)?;
+
+        let field_expr = if let Some(expr) = field_expr {
+            expr.into_token_stream()
+        } else {
+            find_field(data.extract_struct_fields()?)?
+        };
+
+        Ok(Self {
+            ident,
+            generics,
+            field_expr,
+        })
+    }
+}
+
+impl StructNameDebug {
+    #[inline]
+    pub fn derive(tokens: crate::TokenStream1) -> crate::TokenStream1 {
+        let StructNameDebug {
+            ident,
+            generics,
+            field_expr,
+        } = parse_macro_input!(tokens);
+
+        let ident_str = LitStr::new(&ident.to_string(), ident.span());
+        let header = GenericImpl::new(generics)
+            .with_trait(quote!(#FMT::Debug))
+            .with_target(ident);
+
+        let out = quote! {
+            #[automatically_derived]
+            #header {
+                fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                    f.debug_tuple(#ident_str).field(#field_expr).finish()
+                }
+            }
+        };
+
+        out.into()
+    }
+}
+
+fn find_field<It>(fields: It) -> syn::Result<TokenStream>
+where
+    It: IntoIterator<Item = syn::Field>,
+{
+    let mut first = None;
+    for (i, field) in fields.into_iter().enumerate() {
+        if !field
+            .attrs
+            .iter()
+            .any(move |a| a.path().is_ident(ATTR_NAME))
+        {
+            continue;
+        }
+
+        if first.is_some() {
+            return Err(syn::Error::new_spanned(
+                field,
+                "multiple fields flagged with `debug`",
+            ));
+        }
+
+        first = Some((i, field));
+    }
+
+    if let Some((i, field)) = first {
+        let mut out = quote!(&self.);
+
+        if let Some(ident) = field.ident {
+            out.append(ident);
+        } else {
+            out.append(Literal::usize_unsuffixed(i));
+        }
+
+        Ok(out)
+    } else {
+        Err(syn::Error::new(
+            Span::call_site(),
+            "no field marked with `debug`",
+        ))
+    }
+}
diff --git a/src/build.rs b/src/build.rs
new file mode 100644
index 0000000..c0c6b0d
--- /dev/null
+++ b/src/build.rs
@@ -0,0 +1,62 @@
+use crate::error::Error;
+use sealed::sealed;
+use std::future::Future;
+
+/// Finalise the builder.
+///
+/// Implemented:
+///
+/// 1. Directly when the return type is neither primitive nor `serde`-serialisable.
+/// 2. As an alias for [`BuildPrimitive`] for types that implement it.
+#[sealed(pub(crate))]
+pub trait Build {
+    /// Successful response
+    type Ok;
+
+    /// Unsuccessful response
+    type Err;
+
+    /// Finalise the builder
+    #[allow(clippy::missing_errors_doc)]
+    fn build(self) -> Result<Self::Ok, Self::Err>;
+}
+
+/// Finalise the builder for returning a primitive result.
+///
+/// Types that implement this also implement [`IntoFuture`](std::future::IntoFuture) as an alias for calling
+/// [`primitive`](Self::primitive).
+#[sealed(pub(crate))]
+pub trait BuildPrimitive {
+    /// The future returned.
+    type Fut: Future;
+
+    /// Finalise the builder for returning a primitive result.
+    ///
+    /// Types that implement this also implement [`IntoFuture`](std::future::IntoFuture) as an alias for calling
+    /// this fn.
+    #[allow(clippy::missing_errors_doc)]
+    fn primitive(self) -> crate::Result<Self::Fut>;
+}
+
+/// Finalise the builder for returning a [deserialisable](serde::Deserialize) result.
+#[sealed(pub(crate))]
+#[cfg(feature = "serde")]
+pub trait BuildSerde {
+    /// The future returned.
+    type Fut: Future;
+
+    /// Finalise the builder for returning a [deserialisable](serde::Deserialize) result.
+    #[allow(clippy::missing_errors_doc)]
+    fn serde(self) -> crate::Result<Self::Fut>;
+}
+
+#[sealed]
+impl<T: BuildPrimitive> Build for T {
+    type Ok = T::Fut;
+    type Err = Error;
+
+    #[inline]
+    fn build(self) -> crate::Result<Self::Ok> {
+        self.primitive()
+    }
+}
diff --git a/src/cursor.rs b/src/cursor.rs
new file mode 100644
index 0000000..4787132
--- /dev/null
+++ b/src/cursor.rs
@@ -0,0 +1,184 @@
+//! [`IDBCursor`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor) &
+//! [`IDBCursorWithValue`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue) implementations.
+
+pub use base_cursor::BaseCursor;
+pub(crate) use cursor_sys::CursorSys;
+pub use key_cursor::KeyCursor;
+pub use update::Update;
+pub use web_sys::IdbCursorDirection as CursorDirection;
+
+use crate::future::{CursorNextRequest, VoidRequest};
+use crate::internal_utils::SystemRepr;
+use crate::primitive::TryFromJs;
+use internal_macros::errdoc;
+
+mod base_cursor;
+pub(crate) mod cursor_sys;
+mod key_cursor;
+mod update;
+
+iffeat! {
+    #[cfg(feature = "streams")]
+    mod stream;
+    pub use stream::*;
+}
+
+/// An [`IDBCursorWithValue`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue)
+/// implementation.
+#[derive(Debug, derive_more::Deref, derive_more::DerefMut)]
+pub struct Cursor<'a, Qs>(KeyCursor<'a, Qs>);
+
+impl<'a, Qs> Cursor<'a, Qs> {
+    pub(crate) fn new(base: CursorSys, source: &'a Qs) -> Self {
+        Self(KeyCursor::new(base, source))
+    }
+
+    /// Get the key associated with the record at the cursor's current position.
+    ///
+    /// Refers to the key path or generated key when called on an
+    /// [`ObjectStore`](crate::object_store::ObjectStore) and the indexed key path when called on
+    /// an [`Index`](crate::index::Index).
+    ///
+    /// Returns `None` if the cursor's iterated past its end.
+    #[allow(clippy::missing_errors_doc)]
+    pub fn key<T>(&self) -> crate::Result<Option<T>>
+    where
+        Option<T>: TryFromJs,
+    {
+        TryFromJs::from_js(self.as_sys().key()?).map_err(Into::into)
+    }
+
+    /// [`Self::key`] mirror for `serde`-deserialisable keys.
+    #[cfg(feature = "serde")]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn key_ser<T>(&self) -> crate::Result<Option<T>>
+    where
+        Option<T>: crate::serde::DeserialiseFromJs,
+    {
+        crate::serde::DeserialiseFromJs::deserialise_from_js(self.as_sys().key()?)
+    }
+
+    /// Get the next record in the cursor.
+    ///
+    /// Equivalent to calling [`continue()`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/continue)
+    /// followed by [`value`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursorWithValue/value) in JS.
+    #[errdoc(Cursor(TransactionInactiveError, InvalidStateError))]
+    #[inline]
+    pub fn next_record<T>(&mut self) -> CursorNextRequest<T>
+    where
+        T: TryFromJs,
+    {
+        CursorNextRequest::value_js(self)
+    }
+
+    /// Mirror of [`Self::next_record`] for `serde`-deserialisable values.
+    #[cfg(feature = "serde")]
+    pub fn next_record_ser<T>(&mut self) -> CursorNextRequest<T>
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        CursorNextRequest::value_serde(self)
+    }
+
+    /// Delete the record at the cursor's current position. [`key`](Self::key) and
+    /// [`primary_key`](BaseCursor::primary_key) will continue to refer to the current cursor position until the
+    /// cursor is advanced.
+    #[errdoc(Cursor(TransactionInactiveError, ReadOnlyError, InvalidStateError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn delete(&mut self) -> crate::Result<VoidRequest> {
+        let req = self.as_sys().delete()?;
+        self.invalidate_current();
+        Ok(VoidRequest::new(req))
+    }
+
+    /// Overwrite the value at the given position with the given value. If the cursor points to a record that has just
+    /// been deleted, a new record is created.
+    ///
+    /// The value should implement [`TryToJs`](crate::primitive::TryToJs) or, if the `serde` feature is enabled,
+    /// [`Serialize`](serde::Serialize).
+    ///
+    /// If a key type is specified in the builder, the return value will contain the key of the updated record.
+    #[errdoc(Cursor(
+        TransactionInactiveError,
+        ReadOnlyError,
+        InvalidStateError,
+        DataErrorUpdate,
+        DataCloneError,
+    ))]
+    #[inline]
+    pub fn update<V>(&self, value: V) -> Update<V> {
+        Update::new(self, value)
+    }
+
+    /// Convert this cursor into a stream of primitive keys.
+    #[cfg(feature = "streams")]
+    #[inline]
+    #[must_use]
+    pub fn key_stream<T>(self) -> Stream<KeyCursor<'a, Qs>, T>
+    where
+        T: TryFromJs,
+    {
+        self.0.key_stream()
+    }
+
+    /// Convert this cursor into a stream of `serde`-deserialisable keys.
+    #[cfg(all(feature = "streams", feature = "serde"))]
+    #[inline]
+    #[must_use]
+    pub fn key_stream_ser<T>(self) -> Stream<KeyCursor<'a, Qs>, T>
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        self.0.key_stream_ser()
+    }
+
+    /// Convert this cursor into a stream of primitive values.
+    #[cfg(feature = "streams")]
+    #[must_use]
+    pub fn stream<T>(self) -> Stream<Self, T>
+    where
+        T: TryFromJs,
+    {
+        Stream::new_js(self)
+    }
+
+    /// Convert this cursor into a stream of `serde`-deserialisable values.
+    #[cfg(all(feature = "streams", feature = "serde"))]
+    #[must_use]
+    pub fn stream_ser<T>(self) -> Stream<Self, T>
+    where
+        T: serde::de::DeserializeOwned,
+    {
+        Stream::new_ser(self)
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl<'a, Qs> crate::internal_utils::SystemRepr for Cursor<'a, Qs> {
+    type Repr = <KeyCursor<'a, Qs> as SystemRepr>::Repr;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        self.0.as_sys()
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.0.into_sys()
+    }
+}
+
+impl<Qs> AsMut<BaseCursor> for Cursor<'_, Qs> {
+    #[inline]
+    fn as_mut(&mut self) -> &mut BaseCursor {
+        self.0.as_mut()
+    }
+}
+
+impl<Qs> AsRef<BaseCursor> for Cursor<'_, Qs> {
+    #[inline]
+    fn as_ref(&self) -> &BaseCursor {
+        self.0.as_ref()
+    }
+}
diff --git a/src/cursor/base_cursor.rs b/src/cursor/base_cursor.rs
new file mode 100644
index 0000000..c3c9ab0
--- /dev/null
+++ b/src/cursor/base_cursor.rs
@@ -0,0 +1,251 @@
+use super::{CursorDirection, CursorSys};
+use crate::future::{PollUnpinned, VoidRequest};
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryToJs};
+use fancy_constructor::new;
+use internal_macros::errdoc;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+/// Base implementation for all cursors.
+#[derive(Debug, new)]
+#[new(vis(pub(super)))]
+pub struct BaseCursor {
+    sys: CursorSys,
+
+    #[new(default)]
+    state: CursorState,
+}
+
+#[derive(Debug, Default)]
+pub(crate) enum CursorState {
+    /// We should try reading the current cursor position.
+    #[default]
+    ReadCurrent,
+
+    /// We should query the next record.
+    TryNext,
+
+    /// We are currently reading the next record.
+    ReadingNext(VoidRequest),
+}
+
+impl BaseCursor {
+    /// Get the primary key associated with the record at the cursor's current position.
+    ///
+    /// # Returns
+    ///
+    /// - The first key's primary key if the first cursor result hasn't been retrieved yet.
+    /// - `None` if the cursor's iterated past its end
+    #[allow(clippy::missing_errors_doc)]
+    pub fn primary_key<T>(&self) -> crate::Result<Option<T>>
+    where
+        Option<T>: TryFromJs,
+    {
+        let key = self.as_sys().primary_key()?;
+        TryFromJs::from_js(key).map_err(Into::into)
+    }
+
+    /// [`Self::primary_key`] mirror using `serde`.
+    #[allow(clippy::missing_errors_doc)]
+    #[cfg(feature = "serde")]
+    pub fn primary_key_ser<T>(&self) -> crate::Result<Option<T>>
+    where
+        Option<T>: crate::serde::DeserialiseFromJs,
+    {
+        let key = self.as_sys().primary_key()?;
+        crate::serde::DeserialiseFromJs::deserialise_from_js(key)
+    }
+
+    /// Advance the cursor by `step` records.
+    ///
+    /// Equivalent to calling [`advance(step)`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/advance)
+    /// in JS.
+    #[errdoc(Cursor(TransactionInactiveError, InvalidStateError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub async fn advance_by(&mut self, step: u32) -> crate::Result<()> {
+        if step == 0 {
+            Ok(())
+        } else {
+            self.as_sys().advance(step)?;
+            self.req().await
+        }
+    }
+
+    /// Advance the cursor to the given key. The next record fetched will be for the given key.
+    ///
+    /// Refers to the key path or generated key when called on an
+    /// [`ObjectStore`](crate::object_store::ObjectStore) and the indexed key path when called on
+    /// an [`Index`](crate::index::Index).
+    ///
+    /// Equivalent to calling [`continue(key)`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/continue)
+    /// in JS.
+    #[errdoc(Cursor(TransactionInactiveError, DataError, InvalidStateError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub async fn continue_to_key<T>(&mut self, key: T) -> crate::Result<()>
+    where
+        T: TryToJs,
+    {
+        let key = key.try_to_js()?;
+        self.continue_to_key_common(&key).await
+    }
+
+    /// [`Self::continue_to_key`] mirror using `serde`.
+    #[allow(clippy::missing_errors_doc)]
+    #[cfg(feature = "serde")]
+    pub async fn continue_to_key_ser<T>(&mut self, key: T) -> crate::Result<()>
+    where
+        T: crate::serde::SerialiseToJs,
+    {
+        let key = key.serialise_to_js()?;
+        self.continue_to_key_common(&key).await
+    }
+
+    /// Get the cursor's direction
+    #[inline]
+    #[must_use]
+    pub fn direction(&self) -> CursorDirection {
+        self.as_sys().direction()
+    }
+
+    pub(crate) fn req(&self) -> VoidRequest {
+        VoidRequest::new(self.as_sys().req())
+    }
+
+    pub(crate) fn poll_state<R, F>(
+        &mut self,
+        cx: &mut Context<'_>,
+        read_current: F,
+    ) -> Poll<crate::Result<Option<R>>>
+    where
+        F: FnOnce(&mut Self) -> crate::Result<R>,
+    {
+        let req_poll = match self.state {
+            CursorState::ReadingNext(ref mut req) => req.poll_unpinned(cx),
+            CursorState::ReadCurrent => return Poll::Ready(self.read_current(read_current)),
+            CursorState::TryNext => return self.poll_try_next(cx, read_current),
+        };
+
+        self.on_req_polled(req_poll, read_current)
+    }
+
+    #[inline]
+    pub(super) fn on_cursor_position_reset(&mut self) {
+        self.state = CursorState::ReadCurrent;
+    }
+
+    #[cfg(feature = "streams")]
+    pub(crate) fn is_finished(&self) -> bool {
+        !self.has_key() || (matches!(self.state, CursorState::ReadCurrent) && !self.has_req())
+    }
+
+    fn has_req(&self) -> bool {
+        let req = self.as_sys().maybe_req();
+        !req.is_undefined() && !req.is_null()
+    }
+
+    fn has_key(&self) -> bool {
+        match self.as_sys().key() {
+            Ok(k) => !k.is_undefined() && !k.is_null(),
+            Err(_) => false,
+        }
+    }
+
+    fn read_current<R, F>(&mut self, callback: F) -> crate::Result<Option<R>>
+    where
+        F: FnOnce(&mut Self) -> crate::Result<R>,
+    {
+        // Chrome implementation: request gets unset on cursor end
+        Ok(if self.has_req() {
+            let out = callback(self)?;
+            self.state = CursorState::TryNext;
+            Some(out)
+        } else {
+            None
+        })
+    }
+
+    fn poll_try_next<R, F>(
+        &mut self,
+        cx: &mut Context<'_>,
+        read_current: F,
+    ) -> Poll<crate::Result<Option<R>>>
+    where
+        F: FnOnce(&mut Self) -> crate::Result<R>,
+    {
+        if let Err(e) = self.as_sys().continue_() {
+            return Poll::Ready(Err(e.into()));
+        }
+
+        let mut req = self.req();
+        let req_poll = req.poll_unpinned(cx);
+
+        self.state = CursorState::ReadingNext(req);
+        self.on_req_polled(req_poll, read_current)
+    }
+
+    fn on_req_polled<R, F>(
+        &mut self,
+        poll: Poll<crate::Result<()>>,
+        read_current: F,
+    ) -> Poll<crate::Result<Option<R>>>
+    where
+        F: FnOnce(&mut Self) -> crate::Result<R>,
+    {
+        match poll {
+            Poll::Ready(res) => {
+                self.state = CursorState::ReadCurrent;
+
+                Poll::Ready(match res {
+                    Ok(()) => {
+                        // Firefox implementation: key gets set to undefined on cursor end
+                        if self.has_key() {
+                            self.read_current(read_current)
+                        } else {
+                            Ok(None)
+                        }
+                    }
+                    Err(e) => Err(e),
+                })
+            }
+            Poll::Pending => Poll::Pending,
+        }
+    }
+
+    async fn continue_to_key_common(&mut self, key: &JsValue) -> crate::Result<()> {
+        self.as_sys().continue_with_key(key)?;
+        self.req().await?;
+        self.on_cursor_position_reset();
+        Ok(())
+    }
+
+    pub(super) fn invalidate_current(&mut self) {
+        if matches!(self.state, CursorState::ReadCurrent) {
+            self.state = CursorState::TryNext;
+        }
+    }
+
+    pub(crate) fn key_sys(&self) -> crate::Result<JsValue> {
+        self.as_sys().key().map_err(Into::into)
+    }
+
+    pub(crate) fn value_sys(&self) -> crate::Result<JsValue> {
+        self.as_sys().value().map_err(Into::into)
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for BaseCursor {
+    type Repr = CursorSys;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.sys
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.sys
+    }
+}
diff --git a/src/cursor/cursor_sys.rs b/src/cursor/cursor_sys.rs
new file mode 100644
index 0000000..4dfb9fe
--- /dev/null
+++ b/src/cursor/cursor_sys.rs
@@ -0,0 +1,33 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+extern "C" {
+    /// [`web_sys::IdbCursor`] extension.
+    #[wasm_bindgen(
+        extends = web_sys::IdbCursorWithValue,
+        extends = web_sys::IdbCursor,
+        js_name = IDBCursorWithValue,
+    )]
+    #[derive(Clone, Debug)]
+    pub type CursorSys;
+
+    #[wasm_bindgen(
+        method,
+        structural,
+        getter,
+        js_class = "IDBCursorWithValue",
+        js_name = request,
+        skip_typescript
+    )]
+    pub(crate) fn maybe_req(this: &CursorSys) -> JsValue;
+
+    #[wasm_bindgen(
+        method,
+        structural,
+        getter,
+        js_class = "IDBCursorWithValue",
+        js_name = request,
+        skip_typescript
+    )]
+    pub(crate) fn req(this: &CursorSys) -> web_sys::IdbRequest;
+}
diff --git a/src/cursor/key_cursor.rs b/src/cursor/key_cursor.rs
new file mode 100644
index 0000000..a4a57a1
--- /dev/null
+++ b/src/cursor/key_cursor.rs
@@ -0,0 +1,159 @@
+use super::{BaseCursor, CursorSys};
+use crate::future::CursorNextRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::TryFromJs;
+use accessory::Accessors;
+use derive_more::{AsMut, AsRef, Deref, DerefMut};
+use internal_macros::errdoc;
+
+/// An [`IDBCursor`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor) implementation.
+#[derive(Debug, Accessors, Deref, DerefMut, AsRef, AsMut)]
+pub struct KeyCursor<'a, Qs> {
+    #[deref]
+    #[deref_mut]
+    #[as_ref]
+    #[as_mut]
+    base: BaseCursor,
+
+    /// The thing that spawned this cursor.
+    #[access(get(cp))]
+    source: &'a Qs,
+}
+
+impl<'a, Qs> KeyCursor<'a, Qs> {
+    pub(crate) fn new(base: CursorSys, source: &'a Qs) -> Self {
+        Self {
+            base: BaseCursor::new(base),
+            source,
+        }
+    }
+
+    /// Get the next key in the cursor.
+    ///
+    /// Equivalent to calling [`continue()`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/continue)
+    /// followed by [`key`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/key) in JS.
+    #[inline]
+    #[errdoc(Cursor(TransactionInactiveError, InvalidStateError))]
+    pub fn next_key<T>(&mut self) -> CursorNextRequest<T>
+    where
+        T: TryFromJs,
+    {
+        CursorNextRequest::key_js(self)
+    }
+
+    /// Mirror of [`Self::next_key`] for `serde`-deserialisable keys.
+    #[inline]
+    #[cfg(feature = "serde")]
+    pub fn next_key_ser<T>(&mut self) -> CursorNextRequest<T>
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        CursorNextRequest::key_serde(self)
+    }
+
+    /// Convert this cursor into a stream of primitive keys.
+    #[cfg(feature = "streams")]
+    #[inline]
+    #[must_use]
+    pub fn key_stream<T>(self) -> super::Stream<Self, T>
+    where
+        T: TryFromJs,
+    {
+        super::Stream::new_js_key(self)
+    }
+
+    /// Convert this cursor into a stream of `serde`-deserialisable keys.
+    #[cfg(all(feature = "streams", feature = "serde"))]
+    #[inline]
+    #[must_use]
+    pub fn key_stream_ser<T>(self) -> super::Stream<Self, T>
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        super::Stream::new_ser_key(self)
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl<Qs> crate::internal_utils::SystemRepr for KeyCursor<'_, Qs> {
+    type Repr = <BaseCursor as SystemRepr>::Repr;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        self.base.as_sys()
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.base.into_sys()
+    }
+}
+
+#[cfg(feature = "indices")]
+const _: () = {
+    use crate::primitive::TryToJs;
+    use wasm_bindgen::prelude::*;
+
+    impl KeyCursor<'_, crate::index::Index<'_>> {
+        /// Advance the cursor to the record whose key matches the `key` as well as whose primary key matches the
+        /// `primary_key`.
+        ///
+        /// A typical use case, is to resume the iteration where a previous cursor has been closed, without having to
+        /// compare the keys one by one.
+        ///
+        /// Equivalent to calling
+        /// [`continuePrimaryKey(key, primary_key)`](https://developer.mozilla.org/en-US/docs/Web/API/IDBCursor/continuePrimaryKey)
+        /// in JS.
+        #[errdoc(Cursor(
+            TransactionInactiveError,
+            DataError,
+            InvalidStateError,
+            InvalidAccessError
+        ))]
+        #[allow(clippy::missing_errors_doc)]
+        pub async fn continue_to_primary_key<K, PK>(
+            &mut self,
+            key: K,
+            primary_key: PK,
+        ) -> crate::Result<()>
+        where
+            K: TryToJs,
+            PK: TryToJs,
+        {
+            let key = key.try_to_js()?;
+            let primary_key = primary_key.try_to_js()?;
+            self.continue_to_primary_key_common(&key, &primary_key)
+                .await
+        }
+
+        /// [`Self::continue_to_primary_key`] mirror using `serde`.
+        #[cfg(feature = "serde")]
+        #[allow(clippy::missing_errors_doc)]
+        pub async fn continue_to_primary_key_ser<K, PK>(
+            &mut self,
+            key: K,
+            primary_key: PK,
+        ) -> crate::Result<()>
+        where
+            K: crate::serde::SerialiseToJs,
+            PK: crate::serde::SerialiseToJs,
+        {
+            let key = key.serialise_to_js()?;
+            let primary_key = primary_key.serialise_to_js()?;
+            self.continue_to_primary_key_common(&key, &primary_key)
+                .await
+        }
+
+        async fn continue_to_primary_key_common(
+            &mut self,
+            key: &JsValue,
+            value: &JsValue,
+        ) -> crate::Result<()> {
+            self.as_sys().continue_primary_key(key, value)?;
+            self.req().await?;
+            self.on_cursor_position_reset();
+            Ok(())
+        }
+    }
+};
diff --git a/src/cursor/stream.rs b/src/cursor/stream.rs
new file mode 100644
index 0000000..54490ec
--- /dev/null
+++ b/src/cursor/stream.rs
@@ -0,0 +1,157 @@
+use super::{BaseCursor, Cursor, KeyCursor};
+use crate::future::VoidRequest;
+use crate::primitive::{TryFromJs, TryFromJsExt};
+use derive_more::{Deref, DerefMut};
+use internal_macros::errdoc;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+/// A stream off a [`Cursor`] or [`KeyCursor`].
+#[derive(Deref, DerefMut)]
+pub struct Stream<Cur, T> {
+    #[deref]
+    #[deref_mut]
+    cursor: Cur,
+    read_sys: fn(&BaseCursor) -> crate::Result<JsValue>,
+    fmt_sys: fn(JsValue) -> crate::Result<T>,
+}
+
+impl<'a, Qs, T> Stream<KeyCursor<'a, Qs>, T> {
+    #[inline]
+    pub(super) fn new_js_key(cursor: KeyCursor<'a, Qs>) -> Self
+    where
+        T: TryFromJs,
+    {
+        Self {
+            cursor,
+            read_sys: BaseCursor::key_sys,
+            fmt_sys: T::from_js_base,
+        }
+    }
+
+    #[cfg(feature = "serde")]
+    #[inline]
+    pub(super) fn new_ser_key(cursor: KeyCursor<'a, Qs>) -> Self
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        Self {
+            cursor,
+            read_sys: BaseCursor::key_sys,
+            fmt_sys: T::deserialise_from_js,
+        }
+    }
+}
+
+impl<'a, Qs, T> Stream<Cursor<'a, Qs>, T> {
+    #[inline]
+    pub(super) fn new_js(cursor: Cursor<'a, Qs>) -> Self
+    where
+        T: TryFromJs,
+    {
+        Self {
+            cursor,
+            read_sys: BaseCursor::value_sys,
+            fmt_sys: T::from_js_base,
+        }
+    }
+
+    #[cfg(feature = "serde")]
+    #[inline]
+    pub(super) fn new_ser(cursor: Cursor<'a, Qs>) -> Self
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        Self {
+            cursor,
+            read_sys: BaseCursor::value_sys,
+            fmt_sys: T::deserialise_from_js,
+        }
+    }
+
+    /// Delete the record at the cursor's current position. Inapplicable to key streams.
+    ///
+    /// See [`Cursor::delete`](Cursor::delete) for more information.
+    #[inline]
+    #[errdoc(Cursor(TransactionInactiveError, ReadOnlyError, InvalidStateError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn delete(&mut self) -> crate::Result<VoidRequest> {
+        self.cursor.delete()
+    }
+
+    /// Overwrite the value at the given position with the given value. Inapplicable to key streams.
+    ///
+    /// See [`Cursor::update`](Cursor::update) for more information.
+    #[errdoc(Cursor(
+        TransactionInactiveError,
+        ReadOnlyError,
+        InvalidStateError,
+        DataErrorUpdate,
+        DataCloneError
+    ))]
+    pub fn update<V>(&self, value: V) -> super::Update<V> {
+        self.cursor.update(value)
+    }
+
+    /// Get the key associated with the record at the cursor's current position. Inapplicable to key streams.
+    ///
+    /// Returns `None` if the stream has been iterated past its end.
+    #[inline]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn key<K>(&self) -> crate::Result<Option<K>>
+    where
+        Option<K>: TryFromJs,
+    {
+        self.cursor.key()
+    }
+
+    /// Get the `serde`-serialisable key associated with the record at the cursor's current position. Inapplicable to
+    /// key streams.
+    #[cfg(feature = "serde")]
+    #[inline]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn key_ser<K>(&self) -> crate::Result<Option<K>>
+    where
+        Option<K>: crate::serde::DeserialiseFromJs,
+    {
+        self.cursor.key_ser()
+    }
+}
+
+impl<Cur, T> futures_core::Stream for Stream<Cur, T>
+where
+    Cur: AsMut<BaseCursor> + Unpin,
+{
+    type Item = crate::Result<T>;
+
+    #[inline]
+    fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let Self {
+            ref mut cursor,
+            read_sys,
+            fmt_sys,
+        } = *self;
+
+        let cur_poll = cursor
+            .as_mut()
+            .poll_state(cx, move |cursor| read_sys(cursor).and_then(fmt_sys));
+
+        match cur_poll {
+            Poll::Ready(Ok(Some(v))) => Poll::Ready(Some(Ok(v))),
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Ok(None)) => Poll::Ready(None),
+            Poll::Ready(Err(e)) => Poll::Ready(Some(Err(e))),
+        }
+    }
+}
+
+impl<Cur, T> futures_core::FusedStream for Stream<Cur, T>
+where
+    Cur: AsMut<BaseCursor> + AsRef<BaseCursor> + Unpin,
+{
+    #[inline]
+    fn is_terminated(&self) -> bool {
+        self.cursor.as_ref().is_finished()
+    }
+}
diff --git a/src/cursor/update.rs b/src/cursor/update.rs
new file mode 100644
index 0000000..52a9d1e
--- /dev/null
+++ b/src/cursor/update.rs
@@ -0,0 +1,110 @@
+use super::BaseCursor;
+use crate::future::{BasicRequest, VoidRequest};
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryToJs};
+use fancy_constructor::new;
+use internal_macros::BuildIntoFut;
+use sealed::sealed;
+use std::marker::PhantomData;
+
+pub struct None;
+
+/// Builder for [`update`](super::Cursor::update).
+#[derive(new, BuildIntoFut)]
+#[new(vis(pub(super)))]
+#[must_use]
+pub struct Update<'a, T, KT = None> {
+    cur: &'a BaseCursor,
+    value: T,
+
+    #[new(val(PhantomData))]
+    key_type: PhantomData<KT>,
+}
+
+impl<'a, T, KT> Update<'a, T, KT> {
+    /// Set the type of the key to be returned.
+    #[inline]
+    pub fn with_key_type<KT2>(self) -> Update<'a, T, KT2>
+    where
+        KT2: TryFromJs + Unpin,
+    {
+        Update::new(self.cur, self.value)
+    }
+}
+
+#[sealed]
+impl<T: TryToJs> crate::BuildPrimitive for Update<'_, T> {
+    type Fut = VoidRequest;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let Self {
+            cur,
+            value,
+            key_type: _,
+        } = self;
+
+        let js = value.try_to_js()?;
+        let req = cur.as_sys().update(&js)?;
+
+        Ok(VoidRequest::new(req))
+    }
+}
+
+#[sealed]
+impl<T: TryToJs, KT: TryFromJs + Unpin> crate::BuildPrimitive for Update<'_, T, KT> {
+    type Fut = BasicRequest<KT>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let Self {
+            cur,
+            value,
+            key_type: _,
+        } = self;
+
+        let js = value.try_to_js()?;
+        let req = cur.as_sys().update(&js)?;
+
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use serde::{de::DeserializeOwned, Serialize};
+
+    #[sealed]
+    impl<T: Serialize> crate::BuildSerde for Update<'_, T> {
+        type Fut = VoidRequest;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let Self {
+                cur,
+                value,
+                key_type: _,
+            } = self;
+
+            let js = serde_wasm_bindgen::to_value(&value)?;
+            let req = cur.as_sys().update(&js)?;
+
+            Ok(VoidRequest::new(req))
+        }
+    }
+
+    #[sealed]
+    impl<T: Serialize, KT: DeserializeOwned + Unpin> crate::BuildSerde for Update<'_, T, KT> {
+        type Fut = BasicRequest<KT>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let Self {
+                cur,
+                value,
+                key_type: _,
+            } = self;
+
+            let js = serde_wasm_bindgen::to_value(&value)?;
+            let req = cur.as_sys().update(&js)?;
+
+            Ok(BasicRequest::new_ser(req))
+        }
+    }
+};
diff --git a/src/database.rs b/src/database.rs
new file mode 100644
index 0000000..c0105e9
--- /dev/null
+++ b/src/database.rs
@@ -0,0 +1,181 @@
+//! An [`IDBDatabase`](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase) implementation.
+
+use delegate_display::DelegateDebug;
+use wasm_bindgen::prelude::*;
+
+use internal_macros::{errdoc, generic_bounds};
+pub use store_builder::StoreBuilder;
+pub use store_name::ObjectStoreName;
+pub use tx_builder::TransactionBuilder;
+pub use version_change_event::VersionChangeEvent;
+
+use crate::factory::{DBFactory, OpenDbRequestBuilder};
+use crate::internal_utils::SystemRepr;
+use crate::iter::DomStringIter;
+use crate::transaction::TransactionOptionsSys;
+
+pub(crate) mod db_sys;
+mod store_builder;
+mod store_name;
+mod tx_builder;
+mod version_change_event;
+
+use crate::error::{SimpleValueError, UnexpectedDataError};
+use crate::future::VoidRequest;
+pub(crate) use db_sys::DbSys;
+
+iffeat! {
+    #[cfg(feature = "version-change")]
+    mod version_change_listener;
+    pub use version_change_listener::VersionChangeListener;
+}
+
+/// An [`IDBDatabase`](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase) implementation.
+#[derive(DelegateDebug, Clone)]
+pub struct Database(DbSys);
+
+impl Database {
+    /// Open a database with the given name. Convenience method for [`OpenDbRequestBuilder::new`] - use it when opening
+    /// multiple databases.
+    #[errdoc(Database(
+        InvalidStateErrorObjectStore,
+        TransactionInactiveError,
+        ConstraintError,
+        InvalidAccessErrorCreateObjectStore,
+    ))]
+    #[generic_bounds(db_name(N))]
+    #[inline]
+    pub fn open<N>(name: N) -> OpenDbRequestBuilder<N> {
+        OpenDbRequestBuilder::new(name)
+    }
+
+    /// Create an object store with the given name.
+    #[generic_bounds(store_name(N))]
+    #[inline]
+    pub fn create_object_store<N>(&self, name: N) -> StoreBuilder<N> {
+        StoreBuilder::new(self, name)
+    }
+
+    /// Close the database connection in a background thread.
+    #[inline]
+    pub fn close(self) {
+        self.as_sys().close();
+    }
+
+    /// Close and delete the database.
+    ///
+    /// # Errors
+    ///
+    /// [Undocumented](https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory/deleteDatabase) as of the release
+    /// of this version.
+    pub fn delete(self) -> crate::OpenDbResult<VoidRequest> {
+        let name = self.name();
+        self.close();
+
+        Self::delete_by_name(&name)
+    }
+
+    /// Delete the object store with the given name.
+    #[errdoc(Database(
+        InvalidStateErrorObjectStore,
+        TransactionInactiveError,
+        NotFoundErrorDeleteObjectStore
+    ))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn delete_object_store(&self, name: &str) -> crate::Result<()> {
+        if let Err(e) = self.as_sys().delete_object_store(name) {
+            Err(e.into())
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Get the database name.
+    #[inline]
+    #[must_use]
+    pub fn name(&self) -> String {
+        self.as_sys().name()
+    }
+
+    /// List the names of the object stores within this database.
+    #[inline]
+    pub fn object_store_names(&self) -> DomStringIter {
+        DomStringIter::new(self.as_sys().object_store_names())
+    }
+
+    /// Start a transaction on the given store name(s). Finish the builder with a call to
+    /// [`Build::build`](crate::Build::build).
+    #[errdoc(Database(NotFoundErrorTx, InvalidAccessErrorTx))]
+    #[inline]
+    pub fn transaction<S: ObjectStoreName>(&self, store_names: S) -> TransactionBuilder<S> {
+        TransactionBuilder::new(self, store_names)
+    }
+
+    /// Get the database version.
+    #[inline]
+    #[must_use]
+    pub fn version(&self) -> f64 {
+        self.as_sys().version()
+    }
+
+    /// Delete the database with the given name. Convenience method for [`DBFactory::delete_db`] - use that if you need
+    /// to delete more than one database.
+    ///
+    /// # Errors
+    ///
+    /// [Undocumented](https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory/deleteDatabase) as of the release
+    /// of this version.
+    pub fn delete_by_name(name: &str) -> crate::OpenDbResult<VoidRequest> {
+        DBFactory::new()?.delete_db(name).map_err(Into::into)
+    }
+
+    /// Create a new
+    /// [`versionchange`](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase/versionchange_event)
+    /// listener.
+    #[cfg(feature = "version-change")]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn version_changes(&self) -> crate::Result<VersionChangeListener> {
+        VersionChangeListener::new(self.clone())
+    }
+}
+
+impl Database {
+    pub(crate) fn from_req(req: &web_sys::IdbRequest) -> crate::Result<Self> {
+        Self::from_js(req.result()?)
+    }
+
+    pub(crate) fn from_event(event: &web_sys::Event) -> crate::Result<Self> {
+        match event.target() {
+            Some(target) => match target.dyn_ref() {
+                Some(req) => Self::from_req(req),
+                None => Err(SimpleValueError::DynCast(target.unchecked_into()).into()),
+            },
+            None => Err(UnexpectedDataError::NoEventTarget.into()),
+        }
+    }
+
+    fn from_js(js: JsValue) -> crate::Result<Self> {
+        match js.dyn_into::<web_sys::IdbDatabase>() {
+            Ok(base_db) => Ok(Self(base_db.unchecked_into())),
+            Err(e) => Err(SimpleValueError::DynCast(e).into()),
+        }
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for Database {
+    type Repr = DbSys;
+
+    #[inline]
+    #[doc(hidden)]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.0
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    fn into_sys(self) -> Self::Repr {
+        self.0
+    }
+}
diff --git a/src/database/db_sys.rs b/src/database/db_sys.rs
new file mode 100644
index 0000000..c3c3784
--- /dev/null
+++ b/src/database/db_sys.rs
@@ -0,0 +1,26 @@
+use crate::transaction::{TransactionMode, TransactionOptionsSys};
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+extern "C" {
+    /// [`web_sys::IdbDatabase`] extension.
+    #[wasm_bindgen(extends = web_sys::IdbDatabase, js_name = IDBDatabase)]
+    #[derive(Clone, Debug, PartialEq, Eq)]
+    pub type DbSys;
+
+    #[wasm_bindgen(catch, method, structural, js_class = "IDBDatabase", js_name = transaction, skip_typescript)]
+    pub(crate) fn transaction_with_str_and_mode_and_opts(
+        this: &DbSys,
+        store_name: &str,
+        mode: TransactionMode,
+        opts: &TransactionOptionsSys,
+    ) -> Result<web_sys::IdbTransaction, JsValue>;
+
+    #[wasm_bindgen(catch, method, structural, js_class = "IDBDatabase", js_name = transaction, skip_typescript)]
+    pub(crate) fn transaction_with_str_sequence_and_mode_and_opts(
+        this: &DbSys,
+        store_names: &js_sys::Array,
+        mode: TransactionMode,
+        opts: &TransactionOptionsSys,
+    ) -> Result<web_sys::IdbTransaction, JsValue>;
+}
diff --git a/src/database/store_builder.rs b/src/database/store_builder.rs
new file mode 100644
index 0000000..6867d24
--- /dev/null
+++ b/src/database/store_builder.rs
@@ -0,0 +1,136 @@
+use super::Database;
+use crate::error::Error;
+use crate::internal_utils::SystemRepr;
+use crate::object_store::ObjectStore;
+use crate::KeyPath;
+use internal_macros::generic_bounds;
+use sealed::sealed;
+
+/// Builder for [`Database::create_object_store`].
+///
+/// Finalise with a call to [`Build::build`](crate::Build::build).
+#[must_use]
+pub struct StoreBuilder<'a, N, AI = (), KP = ()> {
+    db: &'a Database,
+    store_name: N,
+    auto_increment: AI,
+    key_path: KP,
+}
+
+impl<'a, N> StoreBuilder<'a, N> {
+    #[generic_bounds(store_name(N))]
+    #[inline]
+    pub(super) fn new(db: &'a Database, store_name: N) -> Self {
+        Self {
+            db,
+            store_name,
+            auto_increment: (),
+            key_path: (),
+        }
+    }
+}
+
+impl<'a, N, AI, KP> StoreBuilder<'a, N, AI, KP> {
+    /// If `true`, the object store has a
+    /// [key generator](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Terminology#key_generator).
+    ///
+    /// Defaults to `false`.
+    #[inline]
+    pub fn with_auto_increment(self, auto_increment: bool) -> StoreBuilder<'a, N, bool, KP> {
+        StoreBuilder {
+            db: self.db,
+            store_name: self.store_name,
+            auto_increment,
+            key_path: self.key_path,
+        }
+    }
+
+    /// The [key path](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Terminology#key_path) to be
+    /// used by the new object store.
+    /// If empty, the object store is created without a key path and uses
+    /// [out-of-line keys](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Terminology#out-of-line_key).
+    #[generic_bounds(key_path(KP2))]
+    #[inline]
+    pub fn with_key_path<KP2>(
+        self,
+        key_path: KeyPath<KP2>,
+    ) -> StoreBuilder<'a, N, AI, KeyPath<KP2>> {
+        StoreBuilder {
+            db: self.db,
+            store_name: self.store_name,
+            auto_increment: self.auto_increment,
+            key_path,
+        }
+    }
+
+    #[generic_bounds(store_name(N))]
+    fn build_with_params(
+        &self,
+        p: &web_sys::IdbObjectStoreParameters,
+    ) -> crate::Result<ObjectStore<'a>> {
+        let sys = self
+            .db
+            .as_sys()
+            .create_object_store_with_optional_parameters(self.store_name.as_ref(), p)?;
+
+        Ok(ObjectStore::from_version_change(sys, self.db))
+    }
+}
+
+#[generic_bounds(store_name(N))]
+#[sealed]
+impl<'a, N> crate::Build for StoreBuilder<'a, N> {
+    type Ok = ObjectStore<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let sys = self
+            .db
+            .as_sys()
+            .create_object_store(self.store_name.as_ref())?;
+        Ok(ObjectStore::from_version_change(sys, self.db))
+    }
+}
+
+#[generic_bounds(store_name(N))]
+#[sealed]
+impl<'a, N> crate::Build for StoreBuilder<'a, N, bool> {
+    type Ok = ObjectStore<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbObjectStoreParameters::new();
+        p.set_auto_increment(self.auto_increment);
+
+        self.build_with_params(&p)
+    }
+}
+
+#[generic_bounds(store_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for StoreBuilder<'a, N, (), KeyPath<KP>> {
+    type Ok = ObjectStore<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbObjectStoreParameters::new();
+        p.set_key_path(&self.key_path.to_js());
+
+        self.build_with_params(&p)
+    }
+}
+
+#[generic_bounds(store_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for StoreBuilder<'a, N, bool, KeyPath<KP>> {
+    type Ok = ObjectStore<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbObjectStoreParameters::new();
+        p.set_auto_increment(self.auto_increment);
+        p.set_key_path(&self.key_path.to_js());
+
+        self.build_with_params(&p)
+    }
+}
diff --git a/src/database/store_name.rs b/src/database/store_name.rs
new file mode 100644
index 0000000..ac4cfac
--- /dev/null
+++ b/src/database/store_name.rs
@@ -0,0 +1,174 @@
+use sealed::sealed;
+use wasm_bindgen::prelude::*;
+
+use super::{Database, TransactionOptionsSys};
+use crate::internal_utils::slice_to_arr;
+use crate::internal_utils::SystemRepr;
+use crate::transaction::TransactionMode;
+
+type TxResult = Result<web_sys::IdbTransaction, JsValue>;
+
+/// Marks a type as usable for object store names.
+#[sealed]
+#[allow(clippy::missing_errors_doc)]
+pub trait ObjectStoreName {
+    /// Open a transaction on the given database.
+    #[doc(hidden)]
+    fn transaction(self, db: &Database) -> TxResult;
+
+    /// Open a transaction on the given database with the given mode.
+    #[doc(hidden)]
+    fn transaction_with_mode(self, db: &Database, mode: TransactionMode) -> TxResult;
+
+    /// Open a transaction on the given database with the given mode and options.
+    #[doc(hidden)]
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: TransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult;
+}
+
+#[sealed]
+impl ObjectStoreName for &str {
+    #[inline]
+    fn transaction(self, db: &Database) -> TxResult {
+        db.as_sys().transaction_with_str(self.as_ref())
+    }
+
+    #[inline]
+    fn transaction_with_mode(self, db: &Database, mode: web_sys::IdbTransactionMode) -> TxResult {
+        db.as_sys()
+            .transaction_with_str_and_mode(self.as_ref(), mode)
+    }
+
+    #[inline]
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: web_sys::IdbTransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        db.as_sys()
+            .transaction_with_str_and_mode_and_opts(self.as_ref(), mode, &opts)
+    }
+}
+
+#[sealed]
+impl ObjectStoreName for &String {
+    #[inline]
+    fn transaction(self, db: &Database) -> TxResult {
+        self.as_str().transaction(db)
+    }
+
+    #[inline]
+    fn transaction_with_mode(self, db: &Database, mode: web_sys::IdbTransactionMode) -> TxResult {
+        self.as_str().transaction_with_mode(db, mode)
+    }
+
+    #[inline]
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: web_sys::IdbTransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        self.as_str()
+            .transaction_with_mode_and_options(db, mode, opts)
+    }
+}
+
+#[sealed]
+impl ObjectStoreName for String {
+    #[inline]
+    fn transaction(self, db: &Database) -> TxResult {
+        <&Self>::transaction(&self, db)
+    }
+
+    #[inline]
+    fn transaction_with_mode(self, db: &Database, mode: web_sys::IdbTransactionMode) -> TxResult {
+        <&Self>::transaction_with_mode(&self, db, mode)
+    }
+
+    #[inline]
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: web_sys::IdbTransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        <&Self>::transaction_with_mode_and_options(&self, db, mode, opts)
+    }
+}
+
+#[sealed]
+impl<T: AsRef<str>> ObjectStoreName for &[T] {
+    fn transaction(self, db: &Database) -> TxResult {
+        db.as_sys()
+            .transaction_with_str_sequence(&slice_to_arr(self))
+    }
+
+    fn transaction_with_mode(self, db: &Database, mode: web_sys::IdbTransactionMode) -> TxResult {
+        db.as_sys()
+            .transaction_with_str_sequence_and_mode(&slice_to_arr(self), mode)
+    }
+
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: web_sys::IdbTransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        db.as_sys().transaction_with_str_sequence_and_mode_and_opts(
+            &slice_to_arr(self),
+            mode,
+            &opts,
+        )
+    }
+}
+
+#[sealed]
+impl<T: AsRef<str>, const N: usize> ObjectStoreName for [T; N] {
+    #[inline]
+    fn transaction(self, db: &Database) -> TxResult {
+        self.as_slice().transaction(db)
+    }
+
+    #[inline]
+    fn transaction_with_mode(self, db: &Database, mode: TransactionMode) -> TxResult {
+        self.as_slice().transaction_with_mode(db, mode)
+    }
+
+    #[inline]
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: TransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        self.as_slice()
+            .transaction_with_mode_and_options(db, mode, opts)
+    }
+}
+
+#[sealed]
+impl<T: AsRef<str>> ObjectStoreName for Vec<T> {
+    fn transaction(self, db: &Database) -> TxResult {
+        self.as_slice().transaction(db)
+    }
+
+    fn transaction_with_mode(self, db: &Database, mode: TransactionMode) -> TxResult {
+        self.as_slice().transaction_with_mode(db, mode)
+    }
+
+    fn transaction_with_mode_and_options(
+        self,
+        db: &Database,
+        mode: TransactionMode,
+        opts: TransactionOptionsSys,
+    ) -> TxResult {
+        self.as_slice()
+            .transaction_with_mode_and_options(db, mode, opts)
+    }
+}
diff --git a/src/database/tx_builder.rs b/src/database/tx_builder.rs
new file mode 100644
index 0000000..e258951
--- /dev/null
+++ b/src/database/tx_builder.rs
@@ -0,0 +1,133 @@
+use super::{Database, ObjectStoreName};
+use crate::error::Error;
+use crate::transaction::{Transaction, TransactionMode, TransactionOptions};
+use sealed::sealed;
+
+/// Start a transaction. Finish the builder with a call to [`Build::build`](crate::Build::build).
+#[derive(Debug, Clone)]
+#[must_use]
+pub struct TransactionBuilder<'a, S, M = (), O = ()> {
+    db: &'a Database,
+    store_names: S,
+    mode: M,
+    opts: O,
+}
+
+impl<'a, S: ObjectStoreName> TransactionBuilder<'a, S> {
+    #[inline]
+    pub(super) fn new(db: &'a Database, store_names: S) -> Self {
+        Self {
+            db,
+            store_names,
+            mode: (),
+            opts: (),
+        }
+    }
+}
+
+impl<'a, S, M, O> TransactionBuilder<'a, S, M, O> {
+    /// Set the store name(s) this transaction will run on.
+    #[inline]
+    pub fn with_store_names<S2: ObjectStoreName>(
+        self,
+        store_names: S2,
+    ) -> TransactionBuilder<'a, S2, M, O> {
+        TransactionBuilder {
+            db: self.db,
+            store_names,
+            mode: self.mode,
+            opts: self.opts,
+        }
+    }
+
+    /// Set the transaction mode for this transaction. The default mode is [`Readonly`](TransactionMode::Readonly).
+    #[inline]
+    pub fn with_mode(self, mode: TransactionMode) -> TransactionBuilder<'a, S, TransactionMode, O> {
+        TransactionBuilder {
+            db: self.db,
+            store_names: self.store_names,
+            mode,
+            opts: self.opts,
+        }
+    }
+
+    /// Set the options for this transaction.
+    #[inline]
+    pub fn with_options(
+        self,
+        opts: TransactionOptions,
+    ) -> TransactionBuilder<'a, S, M, TransactionOptions> {
+        TransactionBuilder {
+            db: self.db,
+            store_names: self.store_names,
+            mode: self.mode,
+            opts,
+        }
+    }
+}
+
+macro_rules! try_match {
+    ($db: expr, $expr: expr) => {
+        match $expr {
+            Ok(tx) => Ok($crate::transaction::Transaction::new($db, tx)),
+            Err(e) => Err(e.into()),
+        }
+    };
+}
+
+#[sealed]
+impl<'a, S> crate::Build for TransactionBuilder<'a, S>
+where
+    S: ObjectStoreName,
+{
+    type Ok = Transaction<'a>;
+    type Err = Error;
+
+    fn build(self) -> crate::Result<Transaction<'a>> {
+        try_match!(self.db, self.store_names.transaction(self.db))
+    }
+}
+
+#[sealed]
+impl<'a, S> crate::Build for TransactionBuilder<'a, S, TransactionMode>
+where
+    S: ObjectStoreName,
+{
+    type Ok = Transaction<'a>;
+    type Err = Error;
+
+    fn build(self) -> crate::Result<Transaction<'a>> {
+        let req = self.store_names.transaction_with_mode(self.db, self.mode);
+        try_match!(self.db, req)
+    }
+}
+
+#[sealed]
+impl<'a, S> crate::Build for TransactionBuilder<'a, S, TransactionMode, TransactionOptions>
+where
+    S: ObjectStoreName,
+{
+    type Ok = Transaction<'a>;
+    type Err = Error;
+
+    fn build(self) -> crate::Result<Transaction<'a>> {
+        let opts = self.opts.try_into()?;
+        let req = self
+            .store_names
+            .transaction_with_mode_and_options(self.db, self.mode, opts);
+        try_match!(self.db, req)
+    }
+}
+
+#[sealed]
+impl<'a, S> crate::Build for TransactionBuilder<'a, S, (), TransactionOptions>
+where
+    S: ObjectStoreName,
+{
+    type Ok = Transaction<'a>;
+    type Err = Error;
+
+    fn build(self) -> crate::Result<Transaction<'a>> {
+        self.with_mode(TransactionMode::Readonly).build()
+    }
+}
diff --git a/src/database/version_change_event.rs b/src/database/version_change_event.rs
new file mode 100644
index 0000000..e46847a
--- /dev/null
+++ b/src/database/version_change_event.rs
@@ -0,0 +1,38 @@
+use crate::internal_utils::StructName;
+use std::fmt::{Debug, Formatter};
+
+/// Fired for [`upgradeneeded`](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest#events),
+/// [`blocked`](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest#events)
+/// & [`versionchange`](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase/versionchange_event) events.
+#[allow(clippy::too_long_first_doc_paragraph)]
+#[derive(StructName, Clone)]
+pub struct VersionChangeEvent(web_sys::IdbVersionChangeEvent);
+
+impl VersionChangeEvent {
+    pub(crate) fn new(event: web_sys::IdbVersionChangeEvent) -> Self {
+        Self(event)
+    }
+
+    /// The old version number of the database.
+    #[inline]
+    #[must_use]
+    pub fn old_version(&self) -> f64 {
+        self.0.old_version()
+    }
+
+    /// The new version number of the database. Will be `None` if the database is being deleted.
+    #[inline]
+    #[must_use]
+    pub fn new_version(&self) -> Option<f64> {
+        self.0.new_version()
+    }
+}
+
+impl Debug for VersionChangeEvent {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct(Self::TYPE_NAME)
+            .field("old_version", &self.old_version())
+            .field("new_version", &self.new_version())
+            .finish()
+    }
+}
diff --git a/src/database/version_change_listener.rs b/src/database/version_change_listener.rs
new file mode 100644
index 0000000..c85d646
--- /dev/null
+++ b/src/database/version_change_listener.rs
@@ -0,0 +1,114 @@
+use super::{Database, VersionChangeEvent};
+use crate::internal_utils::SystemRepr;
+use accessory::Accessors;
+use tokio::sync::mpsc::{
+    channel, unbounded_channel, Receiver, Sender, UnboundedReceiver, UnboundedSender,
+};
+use wasm_bindgen::prelude::*;
+use wasm_bindgen_futures::spawn_local;
+
+type TOnClose = Closure<dyn FnMut()>;
+type TOnVersionChange = Closure<dyn FnMut(web_sys::IdbVersionChangeEvent)>;
+
+const EVT_CLOSE: &str = "close";
+const EVT_CHANGE: &str = "versionchange";
+
+/// A [`versionchange`](https://developer.mozilla.org/en-US/docs/Web/API/IDBDatabase/versionchange_event) event
+/// listener.
+///
+/// Created via [`Database::version_changes`].
+#[derive(Accessors)]
+pub struct VersionChangeListener {
+    /// The database associated with this listener
+    #[access(get)]
+    db: Database,
+    rx_close: Receiver<()>,
+    rx_change: UnboundedReceiver<web_sys::IdbVersionChangeEvent>,
+    cb_close: TOnClose,
+    cb_version_change: TOnVersionChange,
+}
+
+impl VersionChangeListener {
+    pub(super) fn new(db: Database) -> crate::Result<Self> {
+        let (tx_close, rx_close) = channel(1);
+        let (tx_change, rx_change) = unbounded_channel();
+
+        let cb_close = Self::create_on_close(tx_close);
+        let cb_version_change = Self::create_on_change(tx_change);
+
+        db.as_sys()
+            .add_event_listener_with_callback(EVT_CLOSE, cb_close.as_ref().unchecked_ref())?;
+        db.as_sys().add_event_listener_with_callback(
+            EVT_CHANGE,
+            cb_version_change.as_ref().unchecked_ref(),
+        )?;
+
+        Ok(Self {
+            db,
+            rx_close,
+            rx_change,
+            cb_close,
+            cb_version_change,
+        })
+    }
+
+    /// Receive the next event.
+    ///
+    /// Returns `None` if the database gets closed.
+    pub async fn recv(&mut self) -> Option<VersionChangeEvent> {
+        tokio::select! {
+            _ = self.rx_close.recv() => None,
+            opt = self.rx_change.recv() => opt.map(VersionChangeEvent::new),
+        }
+    }
+
+    fn create_on_change(tx: UnboundedSender<web_sys::IdbVersionChangeEvent>) -> TOnVersionChange {
+        TOnVersionChange::wrap(Box::new(move |evt| {
+            let _ = tx.send(evt);
+        }))
+    }
+
+    fn create_on_close(tx: Sender<()>) -> TOnClose {
+        TOnClose::wrap(Box::new(move || {
+            let tx = tx.clone();
+            spawn_local(async move {
+                let _ = tx.send(()).await;
+            });
+        }))
+    }
+}
+
+impl Drop for VersionChangeListener {
+    fn drop(&mut self) {
+        let _ = self
+            .db
+            .as_sys()
+            .remove_event_listener_with_callback(EVT_CLOSE, self.cb_close.as_ref().unchecked_ref());
+
+        let _ = self.db.as_sys().remove_event_listener_with_callback(
+            EVT_CHANGE,
+            self.cb_version_change.as_ref().unchecked_ref(),
+        );
+    }
+}
+
+#[cfg(feature = "streams")]
+const _: () = {
+    use futures_core::Stream;
+    use std::pin::Pin;
+    use std::task::{Context, Poll};
+
+    impl Stream for VersionChangeListener {
+        type Item = VersionChangeEvent;
+
+        fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+            match self.rx_change.poll_recv(cx) {
+                Poll::Ready(opt) => Poll::Ready(opt.map(VersionChangeEvent::new)),
+                Poll::Pending => match self.rx_close.poll_recv(cx) {
+                    Poll::Ready(_) => Poll::Ready(None),
+                    Poll::Pending => Poll::Pending,
+                },
+            }
+        }
+    }
+};
diff --git a/src/date.rs b/src/date.rs
new file mode 100644
index 0000000..c3b2b29
--- /dev/null
+++ b/src/date.rs
@@ -0,0 +1,67 @@
+//! Date handling. Re-exports the [`web_time`](::web_time) crate.
+//!
+//! Note that your code should try to consistently use either `serde` or primitives for date serialisation;
+//! `serde` serialises [`SystemTime`] to `{secs_since_epoch: u64, nanos_since_epoch: u32}` while the primitives
+//! serialise it to a [`js_sys::Date`].
+//!
+//! The [`SerialiseToJs`](crate::serde::SerialiseToJs) wrapper trait is able to offer its own serialisation to
+//! [typed arrays](crate::typed_array::TypedArray) because `js_sys` typed arrays do not implement
+//! [`Serialize`](serde::Serialize); `SystemTime`, however, does, therefore implementing `SerialiseToJs` for
+//! `SystemTime` would create a trait implementation conflict.
+
+#![allow(rustdoc::redundant_explicit_links)]
+
+use js_sys::Reflect;
+use wasm_bindgen::prelude::*;
+pub use web_time::{Duration, Instant, SystemTime, SystemTimeError, UNIX_EPOCH};
+
+use crate::error::SimpleValueError;
+use crate::primitive::{TryFromJs, TryToJs};
+
+const K_SECS: &str = "secs_since_epoch";
+const K_NANOS: &str = "nanos_since_epoch";
+
+#[allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
+pub(crate) fn systime_from_date(js_date: &js_sys::Date) -> SystemTime {
+    SystemTime::UNIX_EPOCH + Duration::from_millis(js_date.get_time() as u64)
+}
+
+/// Try to deserialise a date that's been serialised with `serde`
+fn try_primitive_js_deserialise(js: &JsValue) -> Result<Option<SystemTime>, SimpleValueError> {
+    let secs = match Reflect::get(js, &JsValue::from_str(K_SECS)) {
+        Ok(s) if !s.is_undefined() => s,
+        _ => return Ok(None),
+    };
+    let nanos = match Reflect::get(js, &JsValue::from_str(K_NANOS)) {
+        Ok(n) if !n.is_undefined() => n,
+        _ => return Ok(None),
+    };
+
+    let dur = Duration::new(u64::from_js(secs)?, u32::from_js(nanos)?);
+    Ok(Some(SystemTime::UNIX_EPOCH + dur))
+}
+
+impl TryFromJs for SystemTime {
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        match js.dyn_into::<js_sys::Date>() {
+            Ok(js_date) => Ok(systime_from_date(&js_date)),
+            Err(e) => match try_primitive_js_deserialise(&e)? {
+                Some(st) => Ok(st),
+                None => Err(SimpleValueError::DynCast(e)),
+            },
+        }
+    }
+}
+
+impl TryToJs for SystemTime {
+    #[allow(clippy::cast_precision_loss)]
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        match self.duration_since(UNIX_EPOCH) {
+            Ok(duration) => {
+                let duration = JsValue::from_f64(duration.as_millis() as f64);
+                Ok(js_sys::Date::new(&duration).unchecked_into())
+            }
+            Err(e) => Err(SimpleValueError::Other(Box::new(e)).into()),
+        }
+    }
+}
diff --git a/src/dom_string_iterator.rs b/src/dom_string_iterator.rs
deleted file mode 100644
index 6d149ed..0000000
--- a/src/dom_string_iterator.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use web_sys::DomStringList;
-
-/// An [Iterator] for a [`DomStringList`]
-pub(crate) struct DomStringIterator {
-    inner: DomStringList,
-    idx: u32,
-}
-
-impl From<DomStringList> for DomStringIterator {
-    #[inline]
-    fn from(inner: DomStringList) -> Self {
-        Self { inner, idx: 0 }
-    }
-}
-
-impl DomStringIterator {
-    #[inline]
-    fn len(&self) -> u32 {
-        self.inner.length()
-    }
-
-    #[inline]
-    fn size_hint_base(&self) -> usize {
-        (self.len() - self.idx) as usize
-    }
-}
-
-impl Iterator for DomStringIterator {
-    type Item = String;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(v) = self.inner.item(self.idx) {
-            self.idx += 1;
-            Some(v)
-        } else {
-            None
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let out = self.size_hint_base();
-        (out, Some(out))
-    }
-}
-
-impl ExactSizeIterator for DomStringIterator {
-    #[inline]
-    fn len(&self) -> usize {
-        self.size_hint_base()
-    }
-}
diff --git a/src/error.rs b/src/error.rs
new file mode 100644
index 0000000..51e98a5
--- /dev/null
+++ b/src/error.rs
@@ -0,0 +1,71 @@
+//! Crate errors.
+
+use wasm_bindgen::prelude::*;
+
+pub use dom_exception::DomException;
+pub use js_error::JSError;
+pub use open_db::OpenDbError;
+pub use serde::SerdeError;
+pub use serialisation::SerialisationError;
+pub use simple_value::SimpleValueError;
+
+macro_rules! fwd_from {
+    ($from: ty, $tmp: ty > $target: ty) => {
+        impl From<$from> for $target {
+            fn from(value: $from) -> Self {
+                <$tmp>::from(value).into()
+            }
+        }
+    };
+}
+
+mod dom_exception;
+mod js_error;
+mod open_db;
+mod serde;
+mod serialisation;
+mod simple_value;
+mod unexpected_data;
+
+pub use unexpected_data::UnexpectedDataError;
+
+/// Operation error
+#[derive(Debug, PartialEq, thiserror::Error)]
+pub enum Error {
+    /// Most likely a driver error.
+    #[error(transparent)]
+    DomException(#[from] DomException),
+
+    /// (De)serialisation error.
+    #[error(transparent)]
+    Serialisation(#[from] SerialisationError),
+
+    /// Missing data.
+    #[error("Missing data: {_0}")]
+    MissingData(#[from] UnexpectedDataError),
+
+    /// Generic JS error.
+    #[error("Generic JS error: {0}")]
+    Unknown(#[from] JSError),
+}
+
+fwd_from!(SimpleValueError, SerialisationError > Error);
+fwd_from!(web_sys::DomException, DomException > Error);
+
+impl From<js_sys::Error> for Error {
+    fn from(e: js_sys::Error) -> Self {
+        match e.dyn_into::<web_sys::DomException>() {
+            Ok(e) => e.into(),
+            Err(e) => Self::Unknown(e.into()),
+        }
+    }
+}
+
+impl From<JsValue> for Error {
+    fn from(value: JsValue) -> Self {
+        match value.dyn_into::<web_sys::DomException>() {
+            Ok(v) => v.into(),
+            Err(v) => Self::Unknown(v.into()),
+        }
+    }
+}
diff --git a/src/error/dom_exception.rs b/src/error/dom_exception.rs
new file mode 100644
index 0000000..29c63b5
--- /dev/null
+++ b/src/error/dom_exception.rs
@@ -0,0 +1,81 @@
+use wasm_bindgen::prelude::*;
+
+use internal_macros::dom_exception_err;
+
+use crate::internal_utils::SystemRepr;
+
+/// Wrapper around a [web-sys `DomException`](web_sys::DomException).
+#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error, dom_exception_err)]
+pub enum DomException {
+    /// The object is in an invalid state.
+    InvalidStateError(web_sys::DomException),
+
+    /// A request was placed against a transaction that is currently not active or is finished.
+    TransactionInactiveError(web_sys::DomException),
+
+    /// The object cannot be found here.
+    NotFoundError(web_sys::DomException),
+
+    /// A mutation operation in a transaction failed because a constraint was not satisfied.
+    ConstraintError(web_sys::DomException),
+
+    /// The object does not support the operation or argument.
+    InvalidAccessError(web_sys::DomException),
+
+    /// Provided data is inadequate.
+    DataError(web_sys::DomException),
+
+    /// The operation was aborted.
+    AbortError(web_sys::DomException),
+
+    /// The mutating operation was attempted in a [`Readonly`](crate::transaction::TransactionMode::Readonly)
+    /// transaction.
+    ReadOnlyError(web_sys::DomException),
+
+    /// The object can not be cloned.
+    DataCloneError(web_sys::DomException),
+
+    /// The string did not match the expected pattern.
+    SyntaxError(web_sys::DomException),
+
+    /// An different, unhandled DOM exception.
+    #[from_dom_exception(default)]
+    Other(web_sys::DomException),
+}
+
+impl DomException {
+    /// Javascript error message
+    #[must_use]
+    pub fn message(&self) -> String {
+        self.as_sys().message()
+    }
+}
+
+impl AsRef<JsValue> for DomException {
+    fn as_ref(&self) -> &JsValue {
+        self.as_sys().unchecked_ref()
+    }
+}
+
+impl From<DomException> for JsValue {
+    fn from(value: DomException) -> Self {
+        value.into_sys().unchecked_into()
+    }
+}
+
+impl From<DomException> for web_sys::DomException {
+    #[inline]
+    fn from(value: DomException) -> Self {
+        value.into_sys()
+    }
+}
+
+impl TryFrom<JsValue> for DomException {
+    type Error = JsValue;
+
+    fn try_from(value: JsValue) -> Result<Self, Self::Error> {
+        value.dyn_into::<web_sys::DomException>().map(Into::into)
+    }
+}
+
+unsafe impl Send for DomException {}
diff --git a/src/error/js_error.rs b/src/error/js_error.rs
new file mode 100644
index 0000000..539969c
--- /dev/null
+++ b/src/error/js_error.rs
@@ -0,0 +1,64 @@
+use std::fmt::{Display, Formatter};
+
+use wasm_bindgen::prelude::*;
+
+use super::DomException;
+
+/// A catch-all error.
+#[derive(Debug, Clone, PartialEq, derive_more::From)]
+pub enum JSError {
+    /// A generic [error](js_sys::Error) error.
+    #[from]
+    Error(js_sys::Error),
+
+    /// A non-[error](js_sys::Error) error.
+    Unknown(JsValue),
+}
+
+fwd_from!(DomException, web_sys::DomException > JSError);
+
+impl From<JsValue> for JSError {
+    fn from(value: JsValue) -> Self {
+        match value.dyn_into() {
+            Ok(e) => Self::Error(e),
+            Err(e) => Self::Unknown(e),
+        }
+    }
+}
+
+impl From<web_sys::DomException> for JSError {
+    fn from(value: web_sys::DomException) -> Self {
+        value.unchecked_into::<js_sys::Error>().into()
+    }
+}
+
+impl Display for JSError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Error(e) => Display::fmt(&e.message(), f),
+            Self::Unknown(_) => f.write_str("Non-Error JSValue error"),
+        }
+    }
+}
+
+impl std::error::Error for JSError {}
+
+impl AsRef<JsValue> for JSError {
+    fn as_ref(&self) -> &JsValue {
+        match self {
+            Self::Error(e) => e.unchecked_ref(),
+            Self::Unknown(e) => e,
+        }
+    }
+}
+
+impl From<JSError> for JsValue {
+    fn from(value: JSError) -> Self {
+        match value {
+            JSError::Error(e) => e.unchecked_into(),
+            JSError::Unknown(e) => e,
+        }
+    }
+}
+
+unsafe impl Send for JSError {}
diff --git a/src/error/open_db.rs b/src/error/open_db.rs
new file mode 100644
index 0000000..0f8c9c8
--- /dev/null
+++ b/src/error/open_db.rs
@@ -0,0 +1,29 @@
+use wasm_bindgen::prelude::*;
+
+use super::{DomException, Error, UnexpectedDataError};
+
+/// Error opening a database.
+#[derive(Debug, PartialEq, thiserror::Error)]
+pub enum OpenDbError {
+    /// Version cannot be zero.
+    #[error("Version cannot be zero")]
+    VersionZero,
+
+    /// Unsupported environment.
+    #[error("Unsupported environment")]
+    UnsupportedEnvironment,
+
+    /// The `indexedDB` getter returned `null` or `undefined`.
+    #[error("The `indexedDB` getter returned `null` or `undefined`")]
+    NullFactory,
+
+    /// A forwarded base error.
+    #[error(transparent)]
+    Base(#[from] Error),
+}
+
+fwd_from!(DomException, Error > OpenDbError);
+fwd_from!(web_sys::DomException, Error > OpenDbError);
+fwd_from!(js_sys::Error, Error > OpenDbError);
+fwd_from!(JsValue, Error > OpenDbError);
+fwd_from!(UnexpectedDataError, Error > OpenDbError);
diff --git a/src/error/serde.rs b/src/error/serde.rs
new file mode 100644
index 0000000..c30c3d9
--- /dev/null
+++ b/src/error/serde.rs
@@ -0,0 +1,79 @@
+use cfg_if::cfg_if;
+
+use super::Error;
+use super::SerialisationError;
+
+cfg_if! {
+    if #[cfg(feature = "serde")] {
+        use serde_wasm_bindgen::Error as BaseError;
+    } else {
+        use crate::internal_utils::StructName;
+    }
+}
+
+/// Wrapper around
+/// [`serde_wasm_bindgen::Error`](https://docs.rs/serde-wasm-bindgen/0.6.5/serde_wasm_bindgen/struct.Error.html).
+///
+/// Is an empty struct if the `serde` feature is not enabled.
+#[cfg_attr(feature = "serde", derive(derive_more::From))]
+#[cfg_attr(not(feature = "serde"), derive(StructName))]
+pub struct SerdeError(#[cfg(feature = "serde")] BaseError);
+
+macro_rules! display_like {
+    ($for: ty > $($which: ident),+) => {
+        $(impl std::fmt::$which for $for {
+            fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+                ::cfg_if::cfg_if! {
+                    if #[cfg(feature = "serde")] {
+                        std::fmt::$which::fmt(&self.0, f)
+                    } else {
+                        f.write_str(&<Self as StructName>::TYPE_NAME)
+                    }
+                }
+            }
+        })+
+    };
+}
+
+display_like!(SerdeError > Debug, Display);
+
+impl ::std::error::Error for SerdeError {
+    #[inline]
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        cfg_if! {
+            if #[cfg(feature = "serde")] {
+                Some(&self.0)
+            } else {
+                None
+            }
+        }
+    }
+}
+
+impl From<SerdeError> for Error {
+    fn from(value: SerdeError) -> Self {
+        SerialisationError::from(value).into()
+    }
+}
+
+#[cfg(feature = "serde")]
+impl From<BaseError> for Error {
+    fn from(value: BaseError) -> Self {
+        SerdeError::from(value).into()
+    }
+}
+
+impl PartialEq for SerdeError {
+    #[cfg_attr(not(feature = "serde"), allow(unused_variables))]
+    fn eq(&self, other: &Self) -> bool {
+        cfg_if! {
+            if #[cfg(feature = "serde")] {
+                self.0.to_string() == other.0.to_string()
+            } else {
+                true
+            }
+        }
+    }
+}
+
+unsafe impl Send for SerdeError {}
diff --git a/src/error/serialisation.rs b/src/error/serialisation.rs
new file mode 100644
index 0000000..3d50d6f
--- /dev/null
+++ b/src/error/serialisation.rs
@@ -0,0 +1,13 @@
+use super::{SerdeError, SimpleValueError};
+
+/// Error (de)serialising a value.
+#[derive(Debug, PartialEq, thiserror::Error)]
+pub enum SerialisationError {
+    /// Error parsing a primitive value.
+    #[error("Simple value parse error: {0}")]
+    SimpleValue(#[from] SimpleValueError),
+
+    /// Error (de)serialising a value. Holds an empty struct if the `serde` feature is not enabled.
+    #[error(transparent)]
+    Serde(#[from] SerdeError),
+}
diff --git a/src/error/simple_value.rs b/src/error/simple_value.rs
new file mode 100644
index 0000000..e434532
--- /dev/null
+++ b/src/error/simple_value.rs
@@ -0,0 +1,97 @@
+use std::error::Error as StdError;
+use std::fmt::{Display, Formatter, Write};
+use wasm_bindgen::prelude::*;
+
+/// Error converting a [`JsValue`] into a Rust equivalent.
+#[derive(Debug, thiserror::Error)]
+pub enum SimpleValueError {
+    /// Expected the value to be a string, but it isn't.
+    #[error("Not a string")]
+    NotAString(JsValue),
+
+    /// Expected the value to be a number, but it isn't.
+    #[error("Not a number")]
+    NotANumber(JsValue),
+
+    /// Expected the value to be a boolean, but it isn't.
+    #[error("Not a boolean")]
+    NotABoolean(JsValue),
+
+    /// [Dynamic cast](JsCast::dyn_into) failed.
+    #[error("Dynamic cast failed")]
+    DynCast(JsValue),
+
+    /// The value is too large.
+    #[error("The value is too large: {}", _0)]
+    TooLarge(f64),
+
+    /// The value is too small.
+    #[error("The value is too small: {}", _0)]
+    TooSmall(f64),
+
+    /// Expected an unsigned value.
+    #[error("The value is signed: {}", _0)]
+    Signed(f64),
+
+    /// Error performing [`TryFromJs`](crate::primitive::TryFromJs) on a [`Switch2`](crate::primitive::Switch2) or its
+    /// derivatives.
+    #[error("Errors performing `TryFromJs` on `Switch`: {}", &FmtSimpleValueErrorArray(_0))]
+    Switch(Vec<SimpleValueError>),
+
+    /// Any other catch-all error.
+    #[error(transparent)]
+    Other(Box<dyn StdError>),
+}
+
+impl PartialEq for SimpleValueError {
+    fn eq(&self, other: &Self) -> bool {
+        match (self, other) {
+            // JS
+            (Self::NotAString(a), Self::NotAString(b))
+            | (Self::NotANumber(a), Self::NotANumber(b))
+            | (Self::NotABoolean(a), Self::NotABoolean(b))
+            | (Self::DynCast(a), Self::DynCast(b)) => a.eq(b),
+
+            // f64
+            (Self::TooLarge(a), Self::TooLarge(b))
+            | (Self::TooSmall(a), Self::TooSmall(b))
+            | (Self::Signed(a), Self::Signed(b)) => a.eq(b),
+
+            // Switch
+            (Self::Switch(ref a), Self::Switch(ref b)) => a.eq(b),
+
+            // Other
+            (Self::Other(ref a), Self::Other(ref b)) => a.to_string() == b.to_string(),
+
+            // Definitely not equal
+            _ => false,
+        }
+    }
+}
+
+struct FmtSimpleValueErrorArray<'a>(&'a [SimpleValueError]);
+impl Display for FmtSimpleValueErrorArray<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        fn fmt_one(item: &impl Display, f: &mut Formatter<'_>) -> std::fmt::Result {
+            f.write_char('`')?;
+            Display::fmt(item, f)?;
+            f.write_char('`')
+        }
+
+        let mut iter = self.0.iter();
+        let Some(first) = iter.next() else {
+            return f.write_str("[empty]");
+        };
+
+        fmt_one(first, f)?;
+
+        for item in iter {
+            f.write_str(", ")?;
+            fmt_one(item, f)?;
+        }
+
+        Ok(())
+    }
+}
+
+unsafe impl Send for SimpleValueError {}
diff --git a/src/error/unexpected_data.rs b/src/error/unexpected_data.rs
new file mode 100644
index 0000000..84485f9
--- /dev/null
+++ b/src/error/unexpected_data.rs
@@ -0,0 +1,34 @@
+/// We reached a state that shouldn't have been allowed by the API.
+#[derive(Debug, PartialEq, Eq, Copy, Clone, thiserror::Error)]
+#[non_exhaustive]
+pub enum UnexpectedDataError {
+    /// [`mpsc`](tokio::sync::mpsc) channel dropped unexpectedly.
+    #[error("`mpsc` channel dropped.")]
+    ChannelDropped,
+
+    /// Expected there to be an error, but there wasn't one.
+    #[error("Expected error not found.")]
+    NoErrorFound,
+
+    /// Expected there to be an
+    /// [`EventTarget`](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget), but there
+    /// wasn't one.
+    #[error("No event target.")]
+    NoEventTarget,
+
+    /// A [`Future`](std::future::Future) was polled in an unexpected way.
+    #[error("`Future` polled unexpectedly.")]
+    PollState,
+
+    /// Expected a Transaction to be aborted, but it was committed.
+    #[error("Expected the Transaction to be aborted, but it was committed.")]
+    TransactionCommitted,
+
+    /// Expected a Transaction to be committed, but it was aborted.
+    #[error("Expected the Transaction to be committed, but it was aborted.")]
+    TransactionAborted,
+
+    /// A mutex was poisoned.
+    #[error("Mutex poisoned.")]
+    PoisonedLock,
+}
diff --git a/src/factory.rs b/src/factory.rs
new file mode 100644
index 0000000..6f36e7b
--- /dev/null
+++ b/src/factory.rs
@@ -0,0 +1,143 @@
+//! An [`IDBFactory`](https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory) implementation.
+
+use delegate_display::DelegateDebug;
+use wasm_bindgen::prelude::*;
+use web_sys::{Window, WorkerGlobalScope};
+
+pub use db_version::DBVersion;
+use internal_macros::generic_bounds;
+pub use req_builder::OpenDbRequestBuilder;
+
+use crate::error::OpenDbError;
+use crate::future::{Request, VoidRequest};
+use crate::internal_utils::SystemRepr;
+use crate::OpenDbResult;
+
+mod db_version;
+
+iffeat! {
+    #[cfg(feature = "list-databases")]
+    mod list_dbs;
+    pub use list_dbs::DatabaseDetails;
+}
+
+mod req_builder;
+
+/// An [`IDBFactory`](https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory) implementation.
+///
+/// Use this instead of [`Database::open`](crate::database::Database::open) when you want to open multiple databases.
+#[derive(Clone, Eq, PartialEq, DelegateDebug)]
+pub struct DBFactory(FactorySys);
+
+impl DBFactory {
+    /// Create a new instance of the factory.
+    #[allow(clippy::missing_errors_doc)]
+    pub fn new() -> OpenDbResult<Self> {
+        raw_factory().map(Self)
+    }
+
+    /// Delete the database with the given name
+    ///
+    /// # Errors
+    ///
+    /// [Undocumented](https://developer.mozilla.org/en-US/docs/Web/API/IDBFactory/deleteDatabase) as of the release
+    /// of this version.
+    pub fn delete_db(&self, name: &str) -> crate::Result<VoidRequest> {
+        let req = self.as_sys().delete_database(name)?;
+
+        Ok(Request::new(req.unchecked_into()))
+    }
+
+    /// Open a database with the given name. Convenience method for [`OpenDbRequestBuilder::new`] followed by
+    /// [`with_factory`](OpenDbRequestBuilder::with_factory).
+    #[generic_bounds(db_name(N))]
+    pub fn open_db<N>(&self, name: N) -> OpenDbRequestBuilder<N, (), (), (), Self> {
+        OpenDbRequestBuilder::new(name).with_factory(self.clone())
+    }
+
+    #[generic_bounds(db_version(V))]
+    pub(crate) fn open_versioned_request<V>(
+        &self,
+        name: &str,
+        version: V,
+    ) -> OpenDbResult<VoidRequest> {
+        let res = version.into_idb_open_request(self, name);
+        fmt_open_raw(res)
+    }
+
+    pub(crate) fn open_request(&self, name: &str) -> OpenDbResult<VoidRequest> {
+        fmt_open_raw(self.as_sys().open(name))
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for DBFactory {
+    type Repr = FactorySys;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.0
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.0
+    }
+}
+
+fn fmt_open_raw(res: Result<web_sys::IdbOpenDbRequest, JsValue>) -> OpenDbResult<VoidRequest> {
+    if let Ok(v) = res {
+        Ok(Request::new(v.unchecked_into()))
+    } else {
+        Err(OpenDbError::VersionZero)
+    }
+}
+
+/// Access to the low-level `wasm-bindgen` factory
+fn raw_factory() -> OpenDbResult<FactorySys> {
+    let global: Global = js_sys::global().unchecked_into();
+
+    let maybe_factory = if !global.window().is_undefined() {
+        global.unchecked_into::<Window>().indexed_db()
+    } else if !global.worker().is_undefined() {
+        global.unchecked_into::<WorkerGlobalScope>().indexed_db()
+    } else if !global.node_global().is_undefined() {
+        global.unchecked_into::<NodeGlobal>().indexed_db()
+    } else {
+        return Err(OpenDbError::UnsupportedEnvironment);
+    }?;
+
+    if let Some(f) = maybe_factory {
+        Ok(f.unchecked_into())
+    } else {
+        Err(OpenDbError::NullFactory)
+    }
+}
+
+#[wasm_bindgen]
+extern "C" {
+    type Global;
+    type NodeGlobal;
+
+    #[wasm_bindgen(extends = web_sys::IdbFactory, js_name = IDBFactory)]
+    #[derive(Clone, Debug, PartialEq, Eq)]
+    #[doc(hidden)]
+    pub type FactorySys;
+
+    #[wasm_bindgen(catch, method, structural, js_class = "IDBFactory", js_name = databases, skip_typescript)]
+    #[cfg(feature = "list-databases")]
+    pub(crate) fn databases(this: &FactorySys) -> Result<JsValue, JsValue>;
+
+    #[wasm_bindgen(method, getter, js_name = Window)]
+    fn window(this: &Global) -> JsValue;
+
+    #[wasm_bindgen(method, getter, js_name = WorkerGlobalScope)]
+    fn worker(this: &Global) -> JsValue;
+
+    #[wasm_bindgen(method, getter, js_name = global)]
+    fn node_global(this: &Global) -> JsValue;
+
+    #[wasm_bindgen(method, getter, catch, js_name = indexedDB)]
+    fn indexed_db(this: &NodeGlobal) -> Result<Option<web_sys::IdbFactory>, JsValue>;
+}
diff --git a/src/factory/db_version.rs b/src/factory/db_version.rs
new file mode 100644
index 0000000..df05cc7
--- /dev/null
+++ b/src/factory/db_version.rs
@@ -0,0 +1,71 @@
+use sealed::sealed;
+use wasm_bindgen::prelude::*;
+
+use crate::internal_utils::SystemRepr;
+
+use super::DBFactory;
+
+/// A low-level trait marking the type as usable in
+/// [`OpenDbRequestBuilder::with_version`](crate::factory::OpenDbRequestBuilder::with_version).
+#[sealed]
+pub trait DBVersion: Copy + Clone {
+    /// Convert into a low level [`IdbOpenDbRequest`](web_sys::IdbOpenDbRequest).
+    #[allow(clippy::missing_errors_doc)]
+    #[doc(hidden)]
+    fn into_idb_open_request(
+        self,
+        factory: &DBFactory,
+        name: &str,
+    ) -> Result<web_sys::IdbOpenDbRequest, JsValue>;
+}
+
+#[sealed]
+impl DBVersion for u32 {
+    #[inline]
+    fn into_idb_open_request(
+        self,
+        factory: &DBFactory,
+        name: &str,
+    ) -> Result<web_sys::IdbOpenDbRequest, JsValue> {
+        factory.as_sys().open_with_u32(name, self)
+    }
+}
+
+#[sealed]
+impl DBVersion for f64 {
+    #[inline]
+    fn into_idb_open_request(
+        self,
+        factory: &DBFactory,
+        name: &str,
+    ) -> Result<web_sys::IdbOpenDbRequest, JsValue> {
+        factory.as_sys().open_with_f64(name, self)
+    }
+}
+
+macro_rules! db_version_alias {
+    ($([$src: ty, $as: ty]),+ $(,)?) => {
+        $(
+            #[::sealed::sealed]
+            impl DBVersion for $src {
+                fn into_idb_open_request(self, factory: &super::DBFactory, name: &str) -> Result<::web_sys::IdbOpenDbRequest, ::wasm_bindgen::JsValue> {
+                    <$as as DBVersion>::into_idb_open_request(self.into(), factory, name)
+                }
+            }
+        )+
+    };
+    (non-0: $($ty: ident),+ $(,)?) => {
+        $(
+            #[::sealed::sealed]
+            impl DBVersion for ::std::num::$ty {
+                #[inline]
+                fn into_idb_open_request(self, factory: &super::DBFactory, name: &str) -> Result<::web_sys::IdbOpenDbRequest, ::wasm_bindgen::JsValue> {
+                    self.get().into_idb_open_request(factory, name)
+                }
+            }
+        )+
+    };
+}
+
+db_version_alias!([u16, u32], [u8, u32], [f32, f64]);
+db_version_alias!(non-0: NonZeroU8, NonZeroU16, NonZeroU32);
diff --git a/src/factory/list_dbs.rs b/src/factory/list_dbs.rs
new file mode 100644
index 0000000..354155d
--- /dev/null
+++ b/src/factory/list_dbs.rs
@@ -0,0 +1,83 @@
+use std::cmp::Ordering;
+use std::fmt::{Display, Formatter, Write};
+
+use accessory::Accessors;
+use fancy_constructor::new;
+use impartial_ord::ImpartialOrd;
+use js_sys::Reflect;
+use wasm_bindgen::prelude::*;
+
+use crate::error::SimpleValueError;
+use crate::future::ListDatabasesFuture;
+use crate::internal_utils::SystemRepr;
+
+use super::DBFactory;
+
+/// Database info returned by [`DBFactory::databases`].
+#[derive(Accessors, new, Clone, ImpartialOrd, Debug)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[new(const_fn)]
+pub struct DatabaseDetails {
+    /// The name of the database
+    #[access(get(ty(&str)))]
+    name: String,
+
+    /// The version of the database
+    #[access(get(const_fn, cp))]
+    version: f64,
+}
+
+impl DBFactory {
+    /// List the names and versions of all databases.
+    #[allow(clippy::missing_errors_doc)]
+    pub fn databases(&self) -> crate::Result<ListDatabasesFuture> {
+        match self.as_sys().databases()?.dyn_into::<js_sys::Promise>() {
+            Ok(promise) => Ok(ListDatabasesFuture::list_databases(promise)),
+            Err(jsval) => Err(SimpleValueError::DynCast(jsval).into()),
+        }
+    }
+}
+
+impl Display for DatabaseDetails {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.name())?;
+        f.write_str(" (v")?;
+        Display::fmt(&self.version, f)?;
+        f.write_char(')')
+    }
+}
+
+impl TryFrom<JsValue> for DatabaseDetails {
+    type Error = crate::error::Error;
+
+    fn try_from(js: JsValue) -> Result<Self, Self::Error> {
+        let name = Reflect::get(&js, &JsValue::from_str("name"))?;
+        let version = Reflect::get(&js, &JsValue::from_str("version"))?;
+
+        match name.as_string() {
+            Some(name) => match version.as_f64() {
+                Some(version) => Ok(Self::new(name, version)),
+                None => Err(SimpleValueError::NotANumber(version).into()),
+            },
+            None => Err(SimpleValueError::NotAString(name).into()),
+        }
+    }
+}
+
+impl PartialEq for DatabaseDetails {
+    fn eq(&self, other: &Self) -> bool {
+        self.name == other.name && matches!(self.version.total_cmp(&other.version), Ordering::Equal)
+    }
+}
+
+impl Eq for DatabaseDetails {}
+
+#[allow(clippy::derive_ord_xor_partial_ord)]
+impl Ord for DatabaseDetails {
+    fn cmp(&self, other: &Self) -> Ordering {
+        match self.name.cmp(&other.name) {
+            Ordering::Equal => self.version.total_cmp(&other.version),
+            ord => ord,
+        }
+    }
+}
diff --git a/src/factory/req_builder.rs b/src/factory/req_builder.rs
new file mode 100644
index 0000000..28f72e4
--- /dev/null
+++ b/src/factory/req_builder.rs
@@ -0,0 +1,252 @@
+use super::DBFactory;
+use crate::error::OpenDbError;
+use crate::future::OpenDbRequest;
+use internal_macros::{generic_bounds, BuildIntoFut, StructName};
+use sealed::sealed;
+
+type WithFactory<N, V = (), B = (), U = ()> = OpenDbRequestBuilder<N, V, B, U, DBFactory>;
+
+/// Database open request builder.
+///
+/// # Generics
+///
+/// | Generic param | Description |
+/// |---|---|
+/// | `N` | Database name |
+/// | `V` | Database version |
+/// | `B` | `blocked` event handler. |
+/// | `U` | `upgradeneeded` event handler. |
+/// | `Fa` | Either [`DBFactory`] or `()` if a factory should be generated on the fly |
+#[derive(Clone, StructName, BuildIntoFut)]
+#[must_use]
+pub struct OpenDbRequestBuilder<N, V = (), B = (), U = (), Fa = ()> {
+    name: N,
+    version: V,
+    on_blocked: B,
+    on_upgrade_needed: U,
+    factory: Fa,
+}
+
+impl<N> OpenDbRequestBuilder<N> {
+    /// Open a database with the given name.
+    #[inline]
+    #[generic_bounds(db_name(N))]
+    pub fn new(name: N) -> Self {
+        Self {
+            name,
+            version: (),
+            on_blocked: (),
+            on_upgrade_needed: (),
+            factory: (),
+        }
+    }
+}
+
+impl<N, V, B, U, Fa> OpenDbRequestBuilder<N, V, B, U, Fa> {
+    /// Set the name of the database being opened.
+    #[generic_bounds(db_name(N2))]
+    pub fn with_name<N2>(self, name: N2) -> OpenDbRequestBuilder<N2, V, B, U, Fa> {
+        OpenDbRequestBuilder {
+            name,
+            version: self.version,
+            on_blocked: self.on_blocked,
+            on_upgrade_needed: self.on_upgrade_needed,
+            factory: self.factory,
+        }
+    }
+
+    /// Set the version of the database being opened.
+    #[generic_bounds(db_version(V2))]
+    pub fn with_version<V2>(self, version: V2) -> OpenDbRequestBuilder<N, V2, B, U, Fa> {
+        OpenDbRequestBuilder {
+            name: self.name,
+            version,
+            on_blocked: self.on_blocked,
+            on_upgrade_needed: self.on_upgrade_needed,
+            factory: self.factory,
+        }
+    }
+
+    /// Set the [`DBFactory`] to use. One will be created if it's not set explicitly.
+    pub fn with_factory(self, factory: DBFactory) -> WithFactory<N, V, B, U> {
+        OpenDbRequestBuilder {
+            name: self.name,
+            version: self.version,
+            on_blocked: self.on_blocked,
+            on_upgrade_needed: self.on_upgrade_needed,
+            factory,
+        }
+    }
+
+    /// Set the [blocked](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest/blocked_event)
+    /// event handler.
+    #[generic_bounds(blocked_cb(B2))]
+    pub fn with_on_blocked<B2>(self, on_blocked: B2) -> OpenDbRequestBuilder<N, V, B2, U, Fa> {
+        OpenDbRequestBuilder {
+            name: self.name,
+            version: self.version,
+            on_blocked,
+            on_upgrade_needed: self.on_upgrade_needed,
+            factory: self.factory,
+        }
+    }
+
+    /// Set the [upgradeneeded](https://developer.mozilla.org/en-US/docs/Web/API/IDBOpenDBRequest/upgradeneeded_event)
+    /// event handler.
+    #[generic_bounds(upgrade_cb(U2))]
+    pub fn with_on_upgrade_needed<U2>(
+        self,
+        on_upgrade_needed: U2,
+    ) -> OpenDbRequestBuilder<N, V, B, U2, Fa> {
+        OpenDbRequestBuilder {
+            name: self.name,
+            version: self.version,
+            on_blocked: self.on_blocked,
+            on_upgrade_needed,
+            factory: self.factory,
+        }
+    }
+
+    /// The name of the database being opened.
+    #[generic_bounds(db_name(N))]
+    #[inline]
+    #[must_use]
+    pub fn name(&self) -> &str {
+        self.name.as_ref()
+    }
+
+    /// Get the version of the database being opened.
+    #[generic_bounds(db_version(V))]
+    #[inline]
+    #[must_use]
+    pub fn version(&self) -> V {
+        self.version
+    }
+}
+
+#[generic_bounds(db_name(N))]
+#[sealed]
+impl<N> crate::Build for WithFactory<N> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self.factory.open_request(self.name())?;
+        Ok(OpenDbRequest::bare(req))
+    }
+}
+
+#[generic_bounds(db_name(N), db_version(V), upgrade_cb(U), blocked_cb(B))]
+#[sealed]
+impl<N, V, B, U> crate::Build for WithFactory<N, V, B, U> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self
+            .factory
+            .open_versioned_request(self.name(), self.version())?;
+        Ok(OpenDbRequest::with_both(
+            req,
+            self.on_blocked,
+            self.on_upgrade_needed,
+        ))
+    }
+}
+
+#[generic_bounds(db_name(N), upgrade_cb(U), blocked_cb(B))]
+#[sealed]
+impl<N, B, U> crate::Build for WithFactory<N, (), B, U> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self.factory.open_request(self.name())?;
+        Ok(OpenDbRequest::with_both(
+            req,
+            self.on_blocked,
+            self.on_upgrade_needed,
+        ))
+    }
+}
+
+#[generic_bounds(db_name(N), db_version(V), upgrade_cb(U))]
+#[sealed]
+impl<N, V, U> crate::Build for WithFactory<N, V, (), U> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self
+            .factory
+            .open_versioned_request(self.name(), self.version())?;
+        Ok(OpenDbRequest::with_upgrade(req, self.on_upgrade_needed))
+    }
+}
+
+#[generic_bounds(db_name(N), upgrade_cb(U))]
+#[sealed]
+impl<N, U> crate::Build for WithFactory<N, (), (), U> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self.factory.open_request(self.name())?;
+        Ok(OpenDbRequest::with_upgrade(req, self.on_upgrade_needed))
+    }
+}
+
+#[generic_bounds(db_name(N), db_version(V), blocked_cb(B))]
+#[sealed]
+impl<N, V, B> crate::Build for WithFactory<N, V, B> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self
+            .factory
+            .open_versioned_request(self.name(), self.version())?;
+        Ok(OpenDbRequest::with_block(req, self.on_blocked))
+    }
+}
+
+#[generic_bounds(db_name(N), blocked_cb(B))]
+#[sealed]
+impl<N, B> crate::Build for WithFactory<N, (), B> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self.factory.open_request(self.name())?;
+        Ok(OpenDbRequest::with_block(req, self.on_blocked))
+    }
+}
+
+#[generic_bounds(db_name(N), db_version(V))]
+#[sealed]
+impl<N, V> crate::Build for WithFactory<N, V> {
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> crate::OpenDbResult<Self::Ok> {
+        let req = self
+            .factory
+            .open_versioned_request(self.name(), self.version())?;
+        Ok(OpenDbRequest::bare(req))
+    }
+}
+
+#[sealed]
+impl<N, V, B, U> crate::Build for OpenDbRequestBuilder<N, V, B, U>
+where
+    WithFactory<N, V, B, U>: crate::Build<Ok = OpenDbRequest, Err = OpenDbError>,
+{
+    type Ok = OpenDbRequest;
+    type Err = OpenDbError;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let factory = DBFactory::new()?;
+
+        self.with_factory(factory).build()
+    }
+}
diff --git a/src/future/array_map.rs b/src/future/array_map.rs
new file mode 100644
index 0000000..ae4d960
--- /dev/null
+++ b/src/future/array_map.rs
@@ -0,0 +1,62 @@
+use crate::error::{Error, SimpleValueError};
+use crate::iter::ArrayMapIter;
+use fancy_constructor::new;
+use sealed::sealed;
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+/// A future returning an [`ArrayMapIter`].
+#[derive(new)]
+#[new(vis(pub(crate)))]
+pub struct ArrayMapFuture<T, F> {
+    src: F,
+    constructor: fn(js_sys::Array) -> ArrayMapIter<T>,
+}
+
+impl<T, F> ArrayMapFuture<T, F> {
+    fn on_polled<V, E>(&self, poll: Poll<Result<V, E>>) -> Poll<crate::Result<ArrayMapIter<T>>>
+    where
+        V: JsCast,
+        E: Into<Error>,
+    {
+        match poll {
+            Poll::Ready(Ok(js)) => Poll::Ready(match js.dyn_into::<js_sys::Array>() {
+                Ok(arr) => Ok((self.constructor)(arr)),
+                Err(js) => Err(SimpleValueError::DynCast(js.unchecked_into()).into()),
+            }),
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Err(e)) => Poll::Ready(Err(e.into())),
+        }
+    }
+}
+
+#[sealed]
+impl<T, F, V, E> super::PollUnpinned for ArrayMapFuture<T, F>
+where
+    F: super::PollUnpinned<Output = Result<V, E>>,
+    V: JsCast,
+    E: Into<Error>,
+{
+    type Output = crate::Result<ArrayMapIter<T>>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        let poll = self.src.poll_unpinned(cx);
+        self.on_polled(poll)
+    }
+}
+
+impl<T, F, V, E> Future for ArrayMapFuture<T, F>
+where
+    F: Future<Output = Result<V, E>> + Unpin,
+    V: JsCast,
+    E: Into<Error>,
+{
+    type Output = crate::Result<ArrayMapIter<T>>;
+
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let poll = Pin::new(&mut self.src).poll(cx);
+        self.on_polled(poll)
+    }
+}
diff --git a/src/future/basic.rs b/src/future/basic.rs
new file mode 100644
index 0000000..0dd4ef1
--- /dev/null
+++ b/src/future/basic.rs
@@ -0,0 +1,66 @@
+use super::Request;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryFromJsExt};
+use fancy_constructor::new;
+use internal_macros::{FutureFromPollUnpinned, StructNameDebug};
+use sealed::sealed;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+/// A basic [`Request`] that only performs basic [`JsValue`] conversion.
+#[derive(StructNameDebug, FutureFromPollUnpinned, new)]
+#[new(vis(), args(req: web_sys::IdbRequest))]
+pub struct BasicRequest<T> {
+    #[new(val(Request::new(req)))]
+    #[debug]
+    base: Request,
+    map_fn: fn(JsValue) -> crate::Result<T>,
+}
+
+impl<T> BasicRequest<T> {
+    #[inline]
+    pub(crate) fn new_primitive(req: web_sys::IdbRequest) -> Self
+    where
+        T: TryFromJs,
+    {
+        Self::new(req, T::from_js_base)
+    }
+
+    #[cfg(feature = "serde")]
+    #[inline]
+    pub(crate) fn new_ser(req: web_sys::IdbRequest) -> Self
+    where
+        T: crate::serde::DeserialiseFromJs,
+    {
+        Self::new(req, T::deserialise_from_js)
+    }
+}
+
+#[sealed]
+impl<T> super::PollUnpinned for BasicRequest<T> {
+    type Output = crate::Result<T>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self.base.poll_unpinned(cx) {
+            Poll::Ready(Ok(js)) => Poll::Ready((self.map_fn)(js)),
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
+        }
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl<T> crate::internal_utils::SystemRepr for BasicRequest<T> {
+    type Repr = <Request as SystemRepr>::Repr;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        self.base.as_sys()
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.base.into_sys()
+    }
+}
diff --git a/src/future/cursor.rs b/src/future/cursor.rs
new file mode 100644
index 0000000..ae0197b
--- /dev/null
+++ b/src/future/cursor.rs
@@ -0,0 +1,69 @@
+use super::Request;
+use crate::cursor::{Cursor, CursorSys, KeyCursor};
+use internal_macros::FutureFromPollUnpinned;
+use sealed::sealed;
+use std::marker::PhantomData;
+use std::task::{Context, Poll};
+use wasm_bindgen::JsCast;
+
+/// A Future for opening a cursor. Resolves to `None` if the cursor is empty.
+#[derive(FutureFromPollUnpinned)]
+pub struct CursorRequest<'a, T, Qs> {
+    source: &'a Qs,
+    req: Request,
+    cursor_ty: PhantomData<T>,
+}
+
+impl<'a, T, Qs> CursorRequest<'a, T, Qs> {
+    pub(crate) fn new(req: web_sys::IdbRequest, source: &'a Qs) -> Self {
+        Self {
+            source,
+            req: Request::new(req),
+            cursor_ty: PhantomData,
+        }
+    }
+}
+
+#[sealed]
+impl<'a, T, Qs> super::PollUnpinned for CursorRequest<'a, T, Qs>
+where
+    T: CursorKind<'a, Qs>,
+{
+    type Output = crate::Result<Option<T>>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self.req.poll_unpinned(cx) {
+            Poll::Ready(res) => Poll::Ready(match res {
+                Ok(js) => Ok(match js.dyn_into::<web_sys::IdbCursor>() {
+                    Ok(sys) => Some(T::construct(sys.unchecked_into(), self.source)),
+                    Err(_) => None,
+                }),
+                Err(e) => Err(e),
+            }),
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
+
+#[sealed]
+#[allow(missing_docs)]
+pub trait CursorKind<'a, Qs> {
+    #[doc(hidden)]
+    fn construct(sys: CursorSys, query_source: &'a Qs) -> Self;
+}
+
+#[sealed]
+impl<'a, Qs> CursorKind<'a, Qs> for Cursor<'a, Qs> {
+    #[inline]
+    fn construct(sys: CursorSys, query_source: &'a Qs) -> Self {
+        Cursor::new(sys, query_source)
+    }
+}
+
+#[sealed]
+impl<'a, Qs> CursorKind<'a, Qs> for KeyCursor<'a, Qs> {
+    #[inline]
+    fn construct(sys: CursorSys, query_source: &'a Qs) -> Self {
+        KeyCursor::new(sys, query_source)
+    }
+}
diff --git a/src/future/cursor_next.rs b/src/future/cursor_next.rs
new file mode 100644
index 0000000..731d526
--- /dev/null
+++ b/src/future/cursor_next.rs
@@ -0,0 +1,69 @@
+use crate::cursor::BaseCursor;
+use crate::primitive::{TryFromJs, TryFromJsExt};
+use fancy_constructor::new;
+use internal_macros::FutureFromPollUnpinned;
+use sealed::sealed;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+/// Future for resolving cursors' `next` & `next_key` method calls.
+#[derive(FutureFromPollUnpinned, new)]
+#[new(vis())]
+pub struct CursorNextRequest<'a, T> {
+    cursor: &'a mut BaseCursor,
+    read_sys: fn(&BaseCursor) -> crate::Result<JsValue>,
+    fmt_sys: fn(JsValue) -> crate::Result<T>,
+}
+
+impl<'a, T> CursorNextRequest<'a, T>
+where
+    T: TryFromJs,
+{
+    #[inline]
+    pub(crate) fn key_js(cursor: &'a mut BaseCursor) -> Self {
+        Self::new(cursor, BaseCursor::key_sys, T::from_js_base)
+    }
+
+    #[inline]
+    pub(crate) fn value_js(cursor: &'a mut BaseCursor) -> Self {
+        Self::new(cursor, BaseCursor::value_sys, T::from_js_base)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<'a, T> CursorNextRequest<'a, T>
+where
+    T: crate::serde::DeserialiseFromJs,
+{
+    #[inline]
+    pub(crate) fn key_serde(cursor: &'a mut BaseCursor) -> Self {
+        Self::new(
+            cursor,
+            BaseCursor::key_sys,
+            crate::serde::DeserialiseFromJs::deserialise_from_js,
+        )
+    }
+
+    #[inline]
+    pub(crate) fn value_serde(cursor: &'a mut BaseCursor) -> Self {
+        Self::new(
+            cursor,
+            BaseCursor::value_sys,
+            crate::serde::DeserialiseFromJs::deserialise_from_js,
+        )
+    }
+}
+
+#[sealed]
+impl<T> super::PollUnpinned for CursorNextRequest<'_, T> {
+    type Output = crate::Result<Option<T>>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        let Self {
+            read_sys, fmt_sys, ..
+        } = *self;
+
+        self.cursor
+            .poll_state(cx, move |cur| read_sys(cur).and_then(fmt_sys))
+    }
+}
diff --git a/src/future/get_all.rs b/src/future/get_all.rs
new file mode 100644
index 0000000..3fced69
--- /dev/null
+++ b/src/future/get_all.rs
@@ -0,0 +1,31 @@
+use super::{ArrayMapFuture, BasicRequest};
+use crate::iter::GetAllPrimitiveIter;
+use crate::primitive::TryFromJs;
+
+#[cfg(feature = "serde")]
+use {crate::iter::GetAllSerdeIter, crate::serde::DeserialiseFromJs};
+
+type BaseReq = BasicRequest<js_sys::Array>;
+
+/// A [`Future`](std::future::Future) resolving to an [`Array`](js_sys::Array) of primitives.
+pub type GetAllPrimitiveRequest<T> = ArrayMapFuture<T, BaseReq>;
+
+/// A [`Future`](std::future::Future) resolving to an [`Array`](js_sys::Array)
+/// of [deserialisables](::serde::Deserialize).
+#[cfg(feature = "serde")]
+pub type GetAllSerdeRequest<T> = ArrayMapFuture<T, BaseReq>;
+
+impl<T: TryFromJs> GetAllPrimitiveRequest<T> {
+    pub(crate) fn get_all_primitive(req: web_sys::IdbRequest) -> Self {
+        let req = BasicRequest::new_primitive(req);
+        Self::new(req, GetAllPrimitiveIter::get_all_primitive)
+    }
+}
+
+#[cfg(feature = "serde")]
+impl<T: DeserialiseFromJs> GetAllSerdeRequest<T> {
+    pub(crate) fn get_all_serde(req: web_sys::IdbRequest) -> Self {
+        let req = BasicRequest::new_primitive(req);
+        Self::new(req, GetAllSerdeIter::get_all_serde)
+    }
+}
diff --git a/src/future/list_dbs.rs b/src/future/list_dbs.rs
new file mode 100644
index 0000000..2900c3e
--- /dev/null
+++ b/src/future/list_dbs.rs
@@ -0,0 +1,13 @@
+use super::ArrayMapFuture;
+use crate::factory::DatabaseDetails;
+use crate::iter::ListDatabasesIter;
+use wasm_bindgen_futures::JsFuture;
+
+/// A [`Future`](std::future::Future) returned by [`DBFactory::databases`](crate::factory::DBFactory::databases).
+pub type ListDatabasesFuture = ArrayMapFuture<DatabaseDetails, JsFuture>;
+
+impl ListDatabasesFuture {
+    pub(crate) fn list_databases(promise: js_sys::Promise) -> Self {
+        Self::new(promise.into(), ListDatabasesIter::list_databases)
+    }
+}
diff --git a/src/future/maybe_errored.rs b/src/future/maybe_errored.rs
new file mode 100644
index 0000000..21eee10
--- /dev/null
+++ b/src/future/maybe_errored.rs
@@ -0,0 +1,44 @@
+use std::task::{Context, Poll};
+
+use crate::error::Error;
+use delegate_display::DelegateDebug;
+use internal_macros::FutureFromPollUnpinned;
+
+const E_POLLED: &str = "MaybeErrored polled after completion";
+
+/// A Future that may have errored from the start.
+#[derive(Debug, FutureFromPollUnpinned)]
+pub struct MaybeErrored<F, E = Error>(Inner<F, E>);
+
+#[derive(DelegateDebug)]
+enum Inner<F, E> {
+    Running(F),
+    Errored(Option<E>),
+}
+
+impl<F, E> MaybeErrored<F, E> {
+    #[inline]
+    pub(crate) fn running(f: F) -> MaybeErrored<F, E> {
+        MaybeErrored(Inner::Running(f))
+    }
+
+    #[inline]
+    pub(crate) fn errored(err: E) -> MaybeErrored<F, E> {
+        MaybeErrored(Inner::Errored(Some(err)))
+    }
+}
+
+#[sealed::sealed]
+impl<T, F, E> super::PollUnpinned for MaybeErrored<F, E>
+where
+    F: super::PollUnpinned<Output = Result<T, E>>,
+{
+    type Output = Result<T, E>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match &mut self.0 {
+            Inner::Running(f) => f.poll_unpinned(cx),
+            Inner::Errored(f) => Poll::Ready(Err(f.take().expect(E_POLLED))),
+        }
+    }
+}
diff --git a/src/future/mod.rs b/src/future/mod.rs
new file mode 100644
index 0000000..9cd09ef
--- /dev/null
+++ b/src/future/mod.rs
@@ -0,0 +1,31 @@
+//! Futures in use by the crate.
+
+pub use array_map::ArrayMapFuture;
+pub use basic::BasicRequest;
+pub use get_all::*;
+pub use maybe_errored::MaybeErrored;
+pub use open_db::OpenDbRequest;
+pub use request::{Request, VoidRequest};
+pub use traits::*;
+
+mod array_map;
+mod basic;
+mod get_all;
+mod maybe_errored;
+mod open_db;
+mod request;
+mod traits;
+
+iffeat! {
+    #[cfg(feature = "list-databases")]
+    mod list_dbs;
+    pub use list_dbs::ListDatabasesFuture;
+}
+
+iffeat! {
+    #[cfg(feature = "cursors")]
+    mod cursor_next;
+    pub(crate) mod cursor;
+    pub use cursor_next::CursorNextRequest;
+    pub use cursor::CursorRequest;
+}
diff --git a/src/future/open_db.rs b/src/future/open_db.rs
new file mode 100644
index 0000000..ebacef8
--- /dev/null
+++ b/src/future/open_db.rs
@@ -0,0 +1,101 @@
+mod listener;
+mod listeners;
+
+use fancy_constructor::new;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+use internal_macros::{generic_bounds, FutureFromPollUnpinned};
+use listener::Listener;
+use listeners::Listeners;
+
+use super::traits::*;
+use super::VoidRequest;
+use crate::database::Database;
+use crate::error::Error;
+use crate::internal_utils::SystemRepr;
+
+/// Future for opening a database.
+#[derive(Debug, new, FutureFromPollUnpinned)]
+#[new(vis())]
+pub struct OpenDbRequest {
+    req: VoidRequest,
+    listeners: Listeners,
+}
+
+impl OpenDbRequest {
+    #[generic_bounds(upgrade_cb(F))]
+    pub(crate) fn with_upgrade<F>(req: VoidRequest, on_upgrade_needed: F) -> Self {
+        let listener = Listener::new_upgrade(on_upgrade_needed);
+        let idb_req = req.as_sys().unchecked_ref();
+        let listeners = Listeners::with_on_upgrade_needed(idb_req, listener);
+
+        Self::new(req, listeners)
+    }
+
+    #[generic_bounds(blocked_cb(F))]
+    pub(crate) fn with_block<F>(req: VoidRequest, on_blocked: F) -> Self {
+        let listener = Listener::new_blocked(on_blocked);
+        let idb_req = req.as_sys().unchecked_ref();
+        let listeners = Listeners::with_block(idb_req, listener);
+
+        Self::new(req, listeners)
+    }
+
+    #[generic_bounds(upgrade_cb(U), blocked_cb(B))]
+    pub(crate) fn with_both<B, U>(req: VoidRequest, on_blocked: B, on_upgrade_needed: U) -> Self {
+        let on_blocked = Listener::new_blocked(on_blocked);
+        let on_upgrade_needed = Listener::new_upgrade(on_upgrade_needed);
+        let idb_req = req.as_sys().unchecked_ref();
+        let listeners = Listeners::with_both(idb_req, on_blocked, on_upgrade_needed);
+
+        Self::new(req, listeners)
+    }
+
+    pub(crate) fn bare(req: VoidRequest) -> Self {
+        Self::new(req, Listeners::with_neither())
+    }
+
+    fn take_ok(&self) -> crate::OpenDbResult<Database> {
+        self.listeners.take_error()?;
+        Database::from_req(self.as_sys()).map_err(Into::into)
+    }
+
+    fn take_err<V>(&self, err_thrown: Error) -> crate::OpenDbResult<V> {
+        self.listeners.take_error()?;
+        Err(err_thrown.into())
+    }
+}
+
+#[::sealed::sealed]
+impl PollUnpinned for OpenDbRequest {
+    type Output = crate::OpenDbResult<Database>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self.req.poll_unpinned(cx) {
+            Poll::Ready(Ok(())) => Poll::Ready(self.take_ok()),
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Err(e)) => Poll::Ready(self.take_err(e)),
+        }
+    }
+}
+
+impl Drop for OpenDbRequest {
+    fn drop(&mut self) {
+        self.listeners.drop_listeners(self.as_sys());
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for OpenDbRequest {
+    type Repr = web_sys::IdbOpenDbRequest;
+
+    fn as_sys(&self) -> &Self::Repr {
+        self.req.as_sys().unchecked_ref()
+    }
+
+    fn into_sys(self) -> Self::Repr {
+        self.as_sys().clone()
+    }
+}
diff --git a/src/future/open_db/listener.rs b/src/future/open_db/listener.rs
new file mode 100644
index 0000000..624585b
--- /dev/null
+++ b/src/future/open_db/listener.rs
@@ -0,0 +1,121 @@
+use crate::database::{Database, VersionChangeEvent};
+use crate::error::{Error, UnexpectedDataError};
+use internal_macros::generic_bounds;
+use std::fmt::{Debug, Display, Formatter};
+use std::mem;
+use std::sync::{Arc, Mutex};
+use wasm_bindgen::prelude::*;
+
+type TClosure = Closure<dyn FnMut(web_sys::IdbVersionChangeEvent) -> Result<(), JsValue> + 'static>;
+
+#[derive(Debug, Default)]
+pub(super) enum Status {
+    #[default]
+    Ok,
+    Err(Error),
+    Taken,
+}
+
+pub(super) struct Listener {
+    status: Arc<Mutex<Status>>,
+    listener: TClosure,
+}
+
+impl From<Status> for crate::Result<()> {
+    fn from(status: Status) -> Self {
+        match status {
+            Status::Ok => Ok(()),
+            Status::Err(e) => Err(e),
+            Status::Taken => Err(UnexpectedDataError::PollState.into()),
+        }
+    }
+}
+
+impl Status {
+    fn new() -> Arc<Mutex<Self>> {
+        Arc::new(Mutex::new(Self::default()))
+    }
+}
+
+impl Listener {
+    #[generic_bounds(upgrade_cb(F))]
+    pub fn new_upgrade<F>(callback: F) -> Self {
+        let status = Status::new();
+        Self {
+            status: status.clone(),
+            listener: Closure::once(move |evt: web_sys::IdbVersionChangeEvent| {
+                let res = Database::from_event(&evt)
+                    .and_then(move |db| callback(VersionChangeEvent::new(evt), db));
+
+                Self::handle_result("onupgradeneeded", &status, res)
+            }),
+        }
+    }
+
+    #[generic_bounds(blocked_cb(F))]
+    pub fn new_blocked<F>(callback: F) -> Self {
+        let status = Status::new();
+        Self {
+            status: status.clone(),
+            listener: Closure::once(move |evt: web_sys::IdbVersionChangeEvent| {
+                let res = callback(VersionChangeEvent::new(evt));
+                Self::handle_result("onblocked", &status, res)
+            }),
+        }
+    }
+
+    fn handle_result<L>(
+        label: L,
+        status: &Mutex<Status>,
+        res: crate::Result<()>,
+    ) -> Result<(), JsValue>
+    where
+        L: Display,
+    {
+        match res {
+            Ok(()) => Ok(()),
+            Err(e) => {
+                let js_err = Self::create_error(label, &e);
+
+                if let Ok(mut status) = status.lock() {
+                    *status = Status::Err(e);
+                }
+
+                Err(js_err.unchecked_into())
+            }
+        }
+    }
+
+    fn create_error<L: Display, E: Display>(label: L, error: E) -> js_sys::Error {
+        let msg = format!(
+            "An error occurred during an `indexed_db_futures` `{label} event handler: {error}"
+        );
+        js_sys::Error::new(&msg)
+    }
+
+    pub fn take_error(&self) -> crate::Result<()> {
+        match self.status.lock() {
+            Ok(mut lock) => {
+                let status = mem::replace(&mut *lock, Status::Taken);
+                drop(lock);
+                status.into()
+            }
+            Err(_) => Err(UnexpectedDataError::PoisonedLock.into()),
+        }
+    }
+}
+
+impl AsRef<js_sys::Function> for Listener {
+    fn as_ref(&self) -> &js_sys::Function {
+        self.listener.as_ref().unchecked_ref()
+    }
+}
+
+impl Debug for Listener {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self.status.lock() {
+            Ok(lock) => Debug::fmt(&*lock, f),
+            Err(_) => Debug::fmt(&UnexpectedDataError::PoisonedLock, f),
+        }
+    }
+}
diff --git a/src/future/open_db/listeners.rs b/src/future/open_db/listeners.rs
new file mode 100644
index 0000000..ef781d0
--- /dev/null
+++ b/src/future/open_db/listeners.rs
@@ -0,0 +1,87 @@
+use super::Listener;
+use derive_more::Debug;
+use smallvec::SmallVec;
+
+type Req = web_sys::IdbOpenDbRequest;
+type CleanupFn = fn(&Req);
+
+#[derive(Debug)]
+pub(super) struct Listeners {
+    listeners: SmallVec<[Listener; 2]>,
+
+    #[debug(skip)]
+    cleanup_fn: CleanupFn,
+}
+
+impl Listeners {
+    pub fn with_block(req: &Req, listener: Listener) -> Self {
+        #[inline]
+        fn cleanup_fn(req: &Req) {
+            req.set_onblocked(None);
+        }
+
+        req.set_onblocked(Some(listener.as_ref()));
+
+        Self::with_one(listener, cleanup_fn)
+    }
+
+    pub fn with_on_upgrade_needed(req: &Req, listener: Listener) -> Self {
+        #[inline]
+        fn cleanup_fn(req: &Req) {
+            req.set_onupgradeneeded(None);
+        }
+
+        req.set_onupgradeneeded(Some(listener.as_ref()));
+
+        Self::with_one(listener, cleanup_fn)
+    }
+
+    pub fn with_both(req: &Req, blocked: Listener, upgrade: Listener) -> Self {
+        fn cleanup_fn(req: &Req) {
+            req.set_onblocked(None);
+            req.set_onupgradeneeded(None);
+        }
+
+        req.set_onblocked(Some(blocked.as_ref()));
+        req.set_onupgradeneeded(Some(upgrade.as_ref()));
+
+        Self {
+            listeners: SmallVec::from_buf([blocked, upgrade]),
+            cleanup_fn,
+        }
+    }
+
+    pub fn with_neither() -> Self {
+        #[inline]
+        fn cleanup_fn(_: &Req) {}
+
+        Self {
+            listeners: SmallVec::new(),
+            cleanup_fn,
+        }
+    }
+
+    fn with_one(listener: Listener, cleanup_fn: CleanupFn) -> Self {
+        Self {
+            listeners: {
+                let mut out = SmallVec::new();
+                out.push(listener);
+                out
+            },
+            cleanup_fn,
+        }
+    }
+
+    pub fn take_error(&self) -> crate::Result<()> {
+        for listener in &self.listeners {
+            listener.take_error()?;
+        }
+
+        Ok(())
+    }
+
+    #[inline]
+    pub fn drop_listeners(&self, req: &Req) {
+        (self.cleanup_fn)(req);
+    }
+}
diff --git a/src/future/request.rs b/src/future/request.rs
new file mode 100644
index 0000000..7e08b7f
--- /dev/null
+++ b/src/future/request.rs
@@ -0,0 +1,72 @@
+mod listeners;
+mod untyped;
+
+use crate::internal_utils::SystemRepr;
+use internal_macros::{FutureFromPollUnpinned, StructNameDebug};
+use listeners::Listeners;
+use sealed::sealed;
+use std::marker::PhantomData;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+
+use super::traits::*;
+use untyped::UntypedRequest;
+
+/// Alias for [`Request<()>`](Request).
+pub type VoidRequest = Request<()>;
+
+/// Future for a [`web-sys` request](web_sys::IdbRequest).
+#[derive(StructNameDebug, FutureFromPollUnpinned)]
+#[debug(expr(self.as_sys()))]
+pub struct Request<T = JsValue> {
+    inner: UntypedRequest,
+    _marker: PhantomData<T>,
+}
+
+impl<T> Request<T> {
+    pub(crate) fn new(req: web_sys::IdbRequest) -> Self {
+        Self {
+            inner: UntypedRequest::Bare(req),
+            _marker: PhantomData,
+        }
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl<T> crate::internal_utils::SystemRepr for Request<T> {
+    type Repr = web_sys::IdbRequest;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        self.inner.as_sys()
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.inner.into_sys()
+    }
+}
+
+#[sealed]
+impl PollUnpinned for Request {
+    type Output = crate::Result<JsValue>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self.inner.poll_unpinned(cx) {
+            Poll::Ready(Ok(())) => Poll::Ready(self.as_sys().result().map_err(Into::into)),
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
+        }
+    }
+}
+
+#[sealed]
+impl PollUnpinned for Request<()> {
+    type Output = crate::Result<()>;
+
+    #[inline]
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        self.inner.poll_unpinned(cx)
+    }
+}
diff --git a/src/future/request/listeners.rs b/src/future/request/listeners.rs
new file mode 100644
index 0000000..96fd377
--- /dev/null
+++ b/src/future/request/listeners.rs
@@ -0,0 +1,69 @@
+use super::super::traits::*;
+use crate::error::UnexpectedDataError;
+use std::task::{Context, Poll};
+use tokio::sync::mpsc;
+use wasm_bindgen::prelude::*;
+
+type Callback = Closure<dyn FnMut() + 'static>;
+
+pub(super) struct Listeners {
+    rx: mpsc::Receiver<()>,
+    req: web_sys::IdbRequest,
+    _callback: Closure<dyn FnMut() + 'static>,
+}
+
+impl Listeners {
+    pub(super) fn new(req: web_sys::IdbRequest) -> Self {
+        let (tx, rx) = mpsc::channel(1);
+
+        let callback = Callback::wrap(Box::new(move || {
+            let _ = tx.try_send(());
+        }));
+
+        let as_fn = callback.as_ref().unchecked_ref();
+        req.set_onsuccess(Some(as_fn));
+        req.set_onerror(Some(as_fn));
+
+        Self {
+            rx,
+            req,
+            _callback: callback,
+        }
+    }
+}
+
+impl Drop for Listeners {
+    fn drop(&mut self) {
+        self.req.set_onsuccess(None);
+        self.req.set_onerror(None);
+    }
+}
+
+#[::sealed::sealed]
+impl PollUnpinned for Listeners {
+    type Output = crate::Result<()>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self.rx.poll_recv(cx) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(Some(())) => Poll::Ready(super::UntypedRequest::req_to_result(&self.req)),
+            Poll::Ready(None) => Poll::Ready(Err(UnexpectedDataError::ChannelDropped.into())),
+        }
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for Listeners {
+    type Repr = web_sys::IdbRequest;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.req
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.req.clone()
+    }
+}
diff --git a/src/future/request/untyped.rs b/src/future/request/untyped.rs
new file mode 100644
index 0000000..8d9fe69
--- /dev/null
+++ b/src/future/request/untyped.rs
@@ -0,0 +1,78 @@
+use super::super::traits::*;
+use super::Listeners;
+use sealed::sealed;
+use std::task::{Context, Poll};
+use wasm_bindgen::prelude::*;
+use web_sys::IdbRequestReadyState;
+
+pub(super) enum UntypedRequest {
+    Bare(web_sys::IdbRequest),
+    WithListeners(Listeners),
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for UntypedRequest {
+    type Repr = web_sys::IdbRequest;
+
+    fn as_sys(&self) -> &Self::Repr {
+        match self {
+            Self::Bare(req) => req,
+            Self::WithListeners(listeners) => listeners.as_sys(),
+        }
+    }
+
+    fn into_sys(self) -> Self::Repr {
+        match self {
+            Self::Bare(req) => req,
+            Self::WithListeners(listeners) => listeners.into_sys(),
+        }
+    }
+}
+
+impl UntypedRequest {
+    pub(super) fn req_to_result(req: &web_sys::IdbRequest) -> crate::Result<()> {
+        match req.error() {
+            Ok(None) => Ok(()),
+            Ok(Some(e)) => Err(e.into()),
+            Err(e) => Err(e.into()),
+        }
+    }
+
+    fn poll_request(req: &web_sys::IdbRequest) -> Poll<crate::Result<()>> {
+        if matches!(req.ready_state(), IdbRequestReadyState::Done) {
+            Poll::Ready(Self::req_to_result(req))
+        } else {
+            Poll::Pending
+        }
+    }
+
+    fn create_listeners(req: &mut web_sys::IdbRequest) -> Listeners {
+        // Take without cloning
+        let req = std::mem::replace(req, JsValue::NULL.unchecked_into());
+        Listeners::new(req)
+    }
+}
+
+#[sealed]
+impl PollUnpinned for UntypedRequest {
+    type Output = crate::Result<()>;
+
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        match self {
+            Self::WithListeners(listeners) => listeners.poll_unpinned(cx),
+            Self::Bare(req) => {
+                if let Poll::Ready(res) = Self::poll_request(req) {
+                    Poll::Ready(res)
+                } else {
+                    let mut listeners = Self::create_listeners(req);
+                    let out = listeners.poll_unpinned(cx);
+
+                    *self = Self::WithListeners(listeners);
+
+                    out
+                }
+            }
+        }
+    }
+}
diff --git a/src/future/traits.rs b/src/future/traits.rs
new file mode 100644
index 0000000..6313c3a
--- /dev/null
+++ b/src/future/traits.rs
@@ -0,0 +1,32 @@
+use sealed::sealed;
+use std::task::{Context, Poll};
+
+/// A type that's pollable without needing to pin it.
+#[sealed(pub(crate))]
+pub trait PollUnpinned {
+    /// Polling result type.
+    type Output;
+
+    /// Poll the type without pinning it.
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output>;
+}
+
+#[sealed]
+impl<T: PollUnpinned> PollUnpinned for &mut T {
+    type Output = T::Output;
+
+    #[inline]
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        T::poll_unpinned(self, cx)
+    }
+}
+
+#[sealed]
+impl<T: PollUnpinned> PollUnpinned for Box<T> {
+    type Output = T::Output;
+
+    #[inline]
+    fn poll_unpinned(&mut self, cx: &mut Context) -> Poll<Self::Output> {
+        T::poll_unpinned(self, cx)
+    }
+}
diff --git a/src/idb_cursor.rs b/src/idb_cursor.rs
deleted file mode 100644
index b74ccef..0000000
--- a/src/idb_cursor.rs
+++ /dev/null
@@ -1,362 +0,0 @@
-//! Cursor-related code
-//!
-//! ## Examples
-//!
-// use super::{*, prelude::*};
-// use wasm_bindgen::prelude::*;
-// use web_sys::DomException;
-//
-// #[allow(unused_variables)]
-// async fn example() -> Result<(), DomException> {
-//     let db = IdbDatabase::open("foo_db")?.into_future().await?;
-//     let tx = db.transaction_on_one("foo_store")?;
-//     let object_store = tx.object_store("foo_store")?;
-//
-//!     match object_store.open_cursor()?.await? {
-//!         Some(cursor) => {
-//!             let first_key: JsValue = cursor.key().unwrap();
-//!             let first_value: JsValue = cursor.value();
-//!
-//!             // Iterate one by one
-//!             while cursor.continue_cursor()?.await? {
-//!                 let subsequent_key: JsValue = cursor.key().unwrap();
-//!                 let subsequent_value: JsValue = cursor.value();
-//!             }
-//!
-//!             // Or collect the remainder into a vector
-//!             let cursor_contents: Vec<KeyVal> = cursor.into_vec(0).await?;
-//!         },
-//!         None => {
-//!             // No elements matched
-//!         }
-//!     };
-//
-//         Ok(())
-//     }
-
-use accessory::Accessors;
-use fancy_constructor::new;
-use std::future::Future;
-use std::rc::Rc;
-
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{DomException, IdbCursorDirection};
-
-pub use idb_cursor_with_value::*;
-
-use crate::idb_query_source::IdbQuerySource;
-use crate::internal_utils::optional_jsvalue_undefined;
-use crate::request::{
-    IdbCursorAdvancementFuture, IdbRequestFuture, IdbRequestRef, JsCastRequestFuture, VoidRequest,
-};
-
-mod idb_cursor_with_value;
-
-/// An interface for an [`IndexedDB` cursor](web_sys::IdbCursor)
-#[derive(Debug, new, Accessors)]
-#[new(vis(pub(crate)))]
-pub struct IdbCursor<'a, T: IdbQuerySource> {
-    inner: web_sys::IdbCursor,
-
-    #[access(get(cp))]
-    /// What spawned this cursor
-    source: &'a T,
-    req: Rc<IdbRequestRef>,
-}
-
-impl<'a, T: IdbQuerySource> IdbCursor<'a, T> {
-    #[inline]
-    pub(crate) fn inner_as_cursor_with_value(&self) -> &web_sys::IdbCursorWithValue {
-        self.inner.unchecked_ref()
-    }
-
-    /// Get the cursor direction
-    #[inline]
-    #[must_use]
-    pub fn direction(&self) -> IdbCursorDirection {
-        self.inner.direction()
-    }
-
-    /// Get the key at the cursor's current position. Returns `None` if the cursor is outside its
-    /// range.
-    #[must_use]
-    pub fn key(&self) -> Option<JsValue> {
-        optional_jsvalue_undefined(self.inner.key().unwrap())
-    }
-
-    /// Get the cursor's current effective primary key. Returns `None` if the cursor is currently
-    /// being iterated or has iterated outside its range.
-    #[inline]
-    #[must_use]
-    pub fn primary_key(&self) -> Option<JsValue> {
-        optional_jsvalue_undefined(self.inner.primary_key().unwrap())
-    }
-
-    /// Common code for continue methods
-    fn continue_common(&self) -> IdbCursorAdvancementFuture {
-        let fut = IdbRequestFuture::new_with_rc(self.req.clone(), true);
-        IdbCursorAdvancementFuture::new(fut)
-    }
-
-    /// Advances the cursor to the next position along its direction
-    pub fn continue_cursor(
-        &self,
-    ) -> Result<impl Future<Output = Result<bool, DomException>>, DomException> {
-        self.inner.continue_()?;
-        Ok(self.continue_common())
-    }
-
-    /// Advances the cursor to the next position along its direction, to the item whose key matches
-    /// the given key parameter
-    pub fn continue_cursor_with_key<K: JsCast>(
-        &self,
-        key: &K,
-    ) -> Result<impl Future<Output = Result<bool, DomException>>, DomException> {
-        self.inner.continue_with_key(key.unchecked_ref())?;
-        Ok(self.continue_common())
-    }
-
-    /// Sets the cursor to the given index key and primary key given as arguments.
-    pub fn continue_primary_key<K: JsCast, PK: JsCast>(
-        &self,
-        key: &K,
-        primary_key: &PK,
-    ) -> Result<impl Future<Output = Result<bool, DomException>>, DomException> {
-        self.inner
-            .continue_primary_key(key.unchecked_ref(), primary_key.unchecked_ref())?;
-        Ok(self.continue_common())
-    }
-
-    /// Sets the number of times a cursor should move its position forward.
-    pub fn advance(
-        &self,
-        count: u32,
-    ) -> Result<impl Future<Output = Result<bool, DomException>>, DomException> {
-        self.inner.advance(count)?;
-        Ok(self.continue_common())
-    }
-
-    /// Internal [`IdbCursor::into_vec`] handler
-    async fn handle_into_vec<F, O>(&self, skip: u32, mapper: F) -> Result<Vec<O>, DomException>
-    where
-        F: Fn(JsValue) -> O,
-    {
-        if skip != 0 && !self.advance(skip)?.await? {
-            return Ok(Vec::new());
-        }
-
-        let mut out = match self.key() {
-            Some(v) => vec![mapper(v)],
-            None => {
-                return Ok(Vec::new());
-            }
-        };
-
-        while self.continue_cursor()?.await? {
-            match self.key() {
-                Some(key) => {
-                    out.push(mapper(key));
-                }
-                None => {
-                    break;
-                }
-            }
-        }
-
-        Ok(out)
-    }
-
-    /// Consume the remainder of the cursor, collecting each key into a vector.
-    ///
-    /// ### Arguments
-    ///
-    /// - **skip** - how many times to advance the cursor before starting to collect keys. Setting
-    ///   this to 0 will include the current key and value in the output; setting it to 5 will skip
-    ///   the current key + value and 4 more.
-    pub async fn into_vec(self, skip: u32) -> Result<Vec<JsValue>, DomException> {
-        fn passthrough(v: JsValue) -> JsValue {
-            v
-        }
-        self.handle_into_vec(skip, passthrough).await
-    }
-
-    /// Delete the record at the cursor's position, without changing the cursor's position
-    pub fn delete(&self) -> Result<VoidRequest, DomException> {
-        Ok(VoidRequest::new(self.inner.delete()?))
-    }
-
-    /// Update the value at the current position of the cursor in the object store
-    pub fn update<V: JsCast>(
-        &self,
-        value: &V,
-    ) -> Result<impl Future<Output = Result<JsValue, DomException>>, DomException> {
-        JsCastRequestFuture::new(self.inner.update(value.unchecked_ref()))
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::cast_possible_truncation, clippy::needless_pass_by_value)]
-pub mod idb_cursor_test {
-    use wasm_bindgen::prelude::*;
-    use web_sys::DomException;
-
-    use crate::internal_utils::open_any_db;
-    use crate::prelude::*;
-
-    test_mod_init!();
-
-    async fn insert_dummy_data(db: &IdbDatabase, store_name: &str) {
-        fn add_values(store: &IdbObjectStore) -> Result<(), DomException> {
-            store.add_key_val_owned("k1", &JsValue::from(1u8))?;
-            store.add_key_val_owned("k2", &JsValue::from(2u8))?;
-            store.add_key_val_owned("k3", &JsValue::from(3u8))?;
-            store.add_key_val_owned("k4", &JsValue::from(4u8))?;
-            Ok(())
-        }
-
-        let tx = db
-            .transaction_on_one_with_mode(store_name, IdbTransactionMode::Readwrite)
-            .expect("Start insert tx open");
-        let store = tx.object_store(store_name).expect("Start insert store");
-
-        add_values(&store).expect("Start insert add_values");
-        tx.await.into_result().expect("Start insert tx await");
-    }
-
-    async fn open_dummy_db() -> (IdbDatabase, String) {
-        let ret = open_any_db().await;
-        insert_dummy_data(&ret.0, &ret.1).await;
-        ret
-    }
-
-    fn map_key(k: Option<JsValue>) -> Option<String> {
-        k?.as_string()
-    }
-
-    #[allow(clippy::cast_sign_loss)]
-    fn map_value(v: JsValue) -> u8 {
-        v.as_f64().expect("failed to unwrap value as f64") as u8
-    }
-
-    async fn do_continue_cursor<'a>(cur: &'a IdbCursor<'a, IdbObjectStore<'a>>) -> bool {
-        cur.continue_cursor()
-            .expect("continue_cursor")
-            .await
-            .expect("continue_cursor_await")
-    }
-
-    async fn open_cur<'a>(
-        store: &'a IdbObjectStore<'a>,
-    ) -> IdbCursorWithValue<'a, IdbObjectStore<'a>> {
-        store
-            .open_cursor()
-            .expect("open_cursor")
-            .await
-            .expect("open_cursor await")
-            .expect("initial cursor empty")
-    }
-
-    test_case!(async idb_cursor_to_vec => {
-        let (db, store_name) = open_dummy_db().await;
-        let tx = db.transaction_on_one(&store_name).unwrap();
-        let store = tx.object_store(&store_name).unwrap();
-        let cur = store.open_key_cursor().unwrap().await.unwrap().unwrap();
-        let cur: Vec<String> = cur.into_vec(2).await.unwrap()
-          .into_iter()
-          .map(|v| v.as_string().unwrap())
-          .collect();
-        let exp: Vec<String> = vec!["k3".into(), "k4".into()];
-
-        assert_eq!(cur, exp);
-    });
-
-    test_case!(async delete_and_update => {
-        async fn process<'a>(cur: &'a IdbCursorWithValue<'a, IdbObjectStore<'a>>) {
-            let key = map_key(cur.key()).expect("unwrap_key");
-            if key.as_str() == "k3" {
-                cur.delete().expect("delete").await.expect("delete await");
-            } else if key.as_str() == "k4" {
-                cur.update(&JsValue::from(100u8)).expect("update").await.expect("update await");
-            }
-        }
-
-        let (db, store_name) = open_dummy_db().await;
-        let tx = db.transaction_on_one_with_mode(&store_name, IdbTransactionMode::Readwrite)
-            .unwrap();
-        let store = tx.object_store(&store_name).unwrap();
-        let cur = open_cur(&store).await;
-
-        process(&cur).await;
-        while do_continue_cursor(&cur).await {
-            process(&cur).await;
-        }
-
-        tx.await.into_result().expect("first tx await");
-
-        let tx = db.transaction_on_one(&store_name).unwrap();
-        let store = tx.object_store(&store_name).unwrap();
-        let mut cur = open_cur(&store).await.into_vec(1).await.unwrap();
-        cur.sort_by_key(|a| a.key().as_string());
-
-        let expected = vec![
-            KeyVal::new("k2".into(), JsValue::from(2u8)),
-            KeyVal::new("k4".into(), JsValue::from(100u8))
-        ];
-
-        assert_eq!(cur, expected);
-    });
-
-    pub mod iteration {
-        test_mod_init!();
-
-        test_case!(async cursor => {
-            let (db, store_name) = open_dummy_db().await;
-            let tx = db.transaction_on_one(&store_name).unwrap();
-            let store = tx.object_store(&store_name).unwrap();
-            let cur = open_cur(&store).await;
-
-            let mut result: Vec<(String, u8)> = Vec::with_capacity(4);
-            result.push((map_key(cur.key()).unwrap(), map_value(cur.value())));
-            while do_continue_cursor(&cur).await {
-                result.push((map_key(cur.key()).unwrap(), map_value(cur.value())));
-            }
-
-            let exp = vec![
-                ("k1".into(), 1),
-                ("k2".into(), 2),
-                ("k3".into(), 3),
-                ("k4".into(), 4)
-            ];
-
-            assert_eq!(result, exp);
-        });
-
-        test_case!(async key_cursor => {
-            let (db, store_name) = open_dummy_db().await;
-            let tx = db.transaction_on_one(&store_name).unwrap();
-            let store = tx.object_store(&store_name).unwrap();
-            let cur = store
-                .open_key_cursor()
-                .expect("open_key_cursor")
-                .await
-                .expect("open_key_cursor await")
-                .expect("initial cursor empty");
-
-            let mut result: Vec<Option<String>> = Vec::with_capacity(3);
-            result.push(map_key(cur.key()));
-            {
-                let r = cur.advance(2).expect("advance").await.expect("advance await");
-                assert!(r, "advance result");
-            }
-            result.push(map_key(cur.key()));
-            while do_continue_cursor(&cur).await {
-                result.push(map_key(cur.key()));
-            }
-            result.sort();
-
-            let exp = vec![Some("k1".into()), Some("k3".into()), Some("k4".into())];
-
-            assert_eq!(result, exp);
-        });
-    }
-}
diff --git a/src/idb_cursor/idb_cursor_with_value.rs b/src/idb_cursor/idb_cursor_with_value.rs
deleted file mode 100644
index 9fdd7b8..0000000
--- a/src/idb_cursor/idb_cursor_with_value.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use accessory::Accessors;
-use delegate_display::DelegateDebug;
-use fancy_constructor::new;
-use std::ops::Deref;
-
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-use crate::idb_query_source::IdbQuerySource;
-
-use super::IdbCursor;
-
-/// A key value pair returned by [`IdbCursorWithValue::into_vec`]
-#[derive(Clone, Debug, PartialEq, new, Accessors)]
-#[access(get)]
-#[new(vis(pub(crate)))]
-pub struct KeyVal {
-    /// The key
-    key: JsValue,
-
-    /// The value
-    value: JsValue,
-}
-
-/// Like [`IdbCursor`], but iterates values as well as keys
-#[derive(DelegateDebug, new)]
-#[ddebug(bounds(T: std::fmt::Debug))]
-#[new(vis(pub(crate)))]
-pub struct IdbCursorWithValue<'a, T: IdbQuerySource>(IdbCursor<'a, T>);
-
-impl<'a, T: IdbQuerySource> IdbCursorWithValue<'a, T> {
-    /// Consume the remainder of the cursor, collecting each key-value pair into a vector.
-    ///
-    /// ### Arguments
-    ///
-    /// - **skip** - how many times to advance the cursor before starting to collect key-value
-    ///   pairs. Setting this to 0 will include the current key and value in the output; setting it to
-    ///   5 will skip the current key + value and 4 more.
-    pub async fn into_vec(self, skip: u32) -> Result<Vec<KeyVal>, DomException> {
-        self.handle_into_vec(skip, |k| KeyVal::new(k, self.value()))
-            .await
-    }
-
-    /// Get the cursor's current value
-    #[must_use]
-    pub fn value(&self) -> JsValue {
-        self.inner_as_cursor_with_value().value().unwrap()
-    }
-}
-
-impl<'a, T: IdbQuerySource> Deref for IdbCursorWithValue<'a, T> {
-    type Target = IdbCursor<'a, T>;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        self.as_ref()
-    }
-}
-
-impl<'a, T: IdbQuerySource> AsRef<IdbCursor<'a, T>> for IdbCursorWithValue<'a, T> {
-    #[inline]
-    fn as_ref(&self) -> &IdbCursor<'a, T> {
-        &self.0
-    }
-}
diff --git a/src/idb_database.rs b/src/idb_database.rs
deleted file mode 100644
index 4f3c6be..0000000
--- a/src/idb_database.rs
+++ /dev/null
@@ -1,454 +0,0 @@
-//! Database-related code
-
-use fancy_constructor::new;
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{DomException, IdbTransactionMode};
-
-pub(crate) use idb_version_change_event::IdbVersionChangeCallback;
-pub use idb_version_change_event::IdbVersionChangeEvent;
-
-use crate::dom_string_iterator::DomStringIterator;
-use crate::idb_object_store::{IdbObjectStore, IdbObjectStoreParameters};
-use crate::idb_transaction::IdbTransaction;
-use crate::internal_utils::arrayify_slice;
-use crate::request::{OpenDbRequest, VoidOpenDbRequest};
-
-mod idb_version_change_event;
-
-/// Wrapper for an [`IndexedDB`](web_sys::IdbDatabase)
-#[derive(Debug, new)]
-#[new(vis(pub(crate)))]
-pub struct IdbDatabase {
-    inner: web_sys::IdbDatabase,
-
-    #[new(default)]
-    on_version_change: Option<IdbVersionChangeCallback>,
-}
-
-type OpenDbResult = Result<OpenDbRequest, DomException>;
-
-impl IdbDatabase {
-    /// Open the database with the given name
-    pub fn open(name: &str) -> OpenDbResult {
-        Ok(OpenDbRequest::new(factory().open(name)?))
-    }
-
-    /// Open the database with the given name and u32 version
-    pub fn open_u32(name: &str, version: u32) -> OpenDbResult {
-        Ok(OpenDbRequest::new(factory().open_with_u32(name, version)?))
-    }
-
-    /// Open the database with the given name and f64 version
-    pub fn open_f64(name: &str, version: f64) -> OpenDbResult {
-        Ok(OpenDbRequest::new(factory().open_with_f64(name, version)?))
-    }
-
-    /// List the names of the object stores within this database
-    #[inline]
-    pub fn object_store_names(&self) -> impl Iterator<Item = String> + 'static {
-        DomStringIterator::from(self.inner.object_store_names())
-    }
-
-    /// Get the database name
-    #[inline]
-    #[must_use]
-    pub fn name(&self) -> String {
-        self.inner.name()
-    }
-
-    /// Get the database version
-    #[inline]
-    #[must_use]
-    pub fn version(&self) -> f64 {
-        self.inner.version()
-    }
-
-    /// Close the database connection
-    #[inline]
-    pub fn close(&self) {
-        self.inner.close();
-    }
-
-    /// Delete the object store with the given name
-    #[inline]
-    pub fn delete_object_store(&self, name: &str) -> Result<(), DomException> {
-        Ok(self.inner.delete_object_store(name)?)
-    }
-
-    /// Close and delete the database
-    pub fn delete(self) -> Result<VoidOpenDbRequest, DomException> {
-        let name = self.name();
-        self.close();
-        Self::delete_by_name(&name)
-    }
-
-    /// Delete the database with the given name
-    pub fn delete_by_name(name: &str) -> Result<VoidOpenDbRequest, DomException> {
-        Ok(VoidOpenDbRequest::new(factory().delete_database(name)?))
-    }
-
-    /// Set the callback to execute when the versionchange event is fired
-    pub fn set_on_version_change<F>(&mut self, callback: Option<F>)
-    where
-        F: Fn(&IdbVersionChangeEvent) -> Result<(), JsValue> + 'static,
-    {
-        self.on_version_change = if let Some(callback) = callback {
-            let cb = IdbVersionChangeEvent::wrap_callback(callback);
-            self.inner
-                .set_onversionchange(Some(cb.as_ref().unchecked_ref()));
-            Some(cb)
-        } else {
-            self.inner.set_onversionchange(None);
-            None
-        };
-    }
-
-    /// Start a transaction on the given object store
-    pub fn transaction_on_one(&self, name: &str) -> Result<IdbTransaction, DomException> {
-        let inner = self.inner.transaction_with_str(name)?;
-        Ok(IdbTransaction::new(inner, self))
-    }
-
-    /// Start a transaction on the given object stores
-    #[inline]
-    pub fn transaction_on_multi(&self, names: &[&str]) -> Result<IdbTransaction, DomException> {
-        self.transaction_on_multi_with_array(&arrayify_slice(names))
-    }
-
-    /// Start a transaction on the given JS array of object store names
-    pub fn transaction_on_multi_with_array<V: JsCast>(
-        &self,
-        names: &V,
-    ) -> Result<IdbTransaction, DomException> {
-        let res = self
-            .inner
-            .transaction_with_str_sequence(names.unchecked_ref())?;
-        Ok(IdbTransaction::new(res, self))
-    }
-
-    /// Start a transaction on the given object store with the given mode
-    pub fn transaction_on_one_with_mode(
-        &self,
-        name: &str,
-        mode: IdbTransactionMode,
-    ) -> Result<IdbTransaction, DomException> {
-        let res = self.inner.transaction_with_str_and_mode(name, mode)?;
-        Ok(IdbTransaction::new(res, self))
-    }
-
-    /// Start a transaction on the given object stores with the given mode
-    #[inline]
-    pub fn transaction_on_multi_with_mode(
-        &self,
-        names: &[&str],
-        mode: IdbTransactionMode,
-    ) -> Result<IdbTransaction, DomException> {
-        self.transaction_on_multi_with_mode_and_array(&arrayify_slice(names), mode)
-    }
-
-    /// Start a transaction on the given JS array of object store names with the given mode
-    pub fn transaction_on_multi_with_mode_and_array<V: JsCast>(
-        &self,
-        names: &V,
-        mode: IdbTransactionMode,
-    ) -> Result<IdbTransaction, DomException> {
-        let res = self
-            .inner
-            .transaction_with_str_sequence_and_mode(names.unchecked_ref(), mode)?;
-        Ok(IdbTransaction::new(res, self))
-    }
-
-    /// Create an object store with the given name
-    pub fn create_object_store(&self, name: &str) -> Result<IdbObjectStore, DomException> {
-        let inner = self.inner.create_object_store(name)?;
-        Ok(IdbObjectStore::from_db(inner, self))
-    }
-
-    /// Create an object store with the given name & optional parameters
-    pub fn create_object_store_with_params(
-        &self,
-        name: &str,
-        params: &IdbObjectStoreParameters,
-    ) -> Result<IdbObjectStore, DomException> {
-        let inner = self
-            .inner
-            .create_object_store_with_optional_parameters(name, params.as_js_value())?;
-        Ok(IdbObjectStore::from_db(inner, self))
-    }
-}
-
-impl Drop for IdbDatabase {
-    fn drop(&mut self) {
-        if self.on_version_change.is_some() {
-            self.inner.set_onversionchange(None);
-        }
-    }
-}
-
-impl_display_for_named!(IdbDatabase);
-
-fn factory() -> web_sys::IdbFactory {
-    #[wasm_bindgen]
-    extern "C" {
-        type Global;
-
-        #[wasm_bindgen(method, getter, js_name = Window)]
-        fn window(this: &Global) -> JsValue;
-
-        #[wasm_bindgen(method, getter, js_name = WorkerGlobalScope)]
-        fn worker(this: &Global) -> JsValue;
-
-        #[wasm_bindgen(method, getter, js_name = global)]
-        fn node_global(this: &Global) -> JsValue;
-    }
-
-    #[wasm_bindgen]
-    extern "C" {
-        type NodeGlobal;
-
-        #[wasm_bindgen(method, getter, catch, js_name = indexedDB)]
-        fn indexed_db(this: &NodeGlobal) -> Result<Option<web_sys::IdbFactory>, JsValue>;
-    }
-
-    let global: Global = js_sys::global().unchecked_into();
-
-    if !global.window().is_undefined() {
-        global
-            .unchecked_into::<web_sys::Window>()
-            .indexed_db()
-            .expect("No `indexedDB` getter in `Window`")
-            .expect("The `indexedDB` getter returned `null` or `undefined`")
-    } else if !global.worker().is_undefined() {
-        global
-            .unchecked_into::<web_sys::WorkerGlobalScope>()
-            .indexed_db()
-            .expect("No `indexedDB` getter in `WorkerGlobalScope`")
-            .expect("The `indexedDB` getter returned `null` or `undefined`")
-    } else if !global.node_global().is_undefined() {
-        global
-            .unchecked_into::<NodeGlobal>()
-            .indexed_db()
-            .expect("No `indexedDB` getter in the Node.js `global` environment")
-            .expect("The `indexedDB` getter returned `null` or `undefined`")
-    } else {
-        panic!(
-            "Only supported in a browser, or web worker, or Node.js with a polyfill for IndexedDB"
-        );
-    }
-}
-
-#[cfg(test)]
-pub mod test {
-    use core::future::Future;
-    use std::cell::RefCell;
-    use std::rc::Rc;
-
-    use crate::request::IdbOpenDbRequestLike;
-    use crate::{IdbKeyPath, IdbQuerySource};
-
-    use super::*;
-
-    fn db_name() -> String {
-        uuid::Uuid::new_v4().to_string()
-    }
-
-    async fn open_db(req: OpenDbRequest) -> IdbDatabase {
-        req.await.expect("Future failed")
-    }
-
-    fn open_db_req(req: Result<OpenDbRequest, DomException>) -> impl Future<Output = IdbDatabase> {
-        open_db(req.expect("Base open failed"))
-    }
-
-    pub mod object_store_names {
-        test_mod_init!();
-
-        test_case!(async empty_iter => {
-            let db = open_db_req(IdbDatabase::open(&db_name())).await;
-            let stores: Vec<String> = db.object_store_names().collect();
-            assert_eq!(stores, Vec::<String>::new());
-        });
-
-        test_case!(async iter_with_two => {
-            fn on_upgrade_needed(evt: &IdbVersionChangeEvent) -> Result<(), JsValue> {
-                evt.db().create_object_store("store1")?;
-                evt.db().create_object_store("store2")?;
-                let _ = evt.transaction(); // make sure it doesn't panic
-                Ok(())
-            }
-
-            let mut req = IdbDatabase::open(&db_name()).expect("Base open");
-            req.set_on_upgrade_needed(Some(on_upgrade_needed));
-            let db = open_db(req).await;
-            let stores: Vec<String> = db.object_store_names().collect();
-
-            assert_eq!(stores, vec![String::from("store1"), String::from("store2")]);
-        });
-    }
-
-    pub mod open {
-        test_mod_init!();
-
-        #[allow(clippy::needless_pass_by_value)]
-        fn test_version(db: &IdbDatabase, version_expected: f64, name_expected: String) {
-            assert_eq!(db.name(), name_expected, "name");
-            assert!((db.version() - version_expected).abs() < 0.01, "version");
-        }
-
-        test_case!(async should_open_without_version => {
-            let name = db_name();
-            test_version(&open_db_req(IdbDatabase::open(&name)).await, 1.0, name);
-        });
-
-        test_case!(async should_open_with_u32 => {
-            let name = db_name();
-            test_version(&open_db_req(IdbDatabase::open_u32(&name, 101)).await, 101.0, name);
-        });
-
-        test_case!(async should_open_with_f64 => {
-            let name = db_name();
-            test_version(&open_db_req(IdbDatabase::open_f64(&name, 42.0)).await, 42.0, name);
-        });
-    }
-
-    pub mod deletions {
-        test_mod_init!();
-
-        test_case!(async delete_object_store => {
-            let db_name = db_name();
-
-            let mut req = IdbDatabase::open_u32(&db_name, 1).expect("open 1");
-            req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-                evt.db().create_object_store("s1")?;
-                evt.db().create_object_store("s2")?;
-                Ok(())
-            }));
-            let db = req.await.expect("db await 1");
-            db.close();
-
-            let mut req = IdbDatabase::open_u32(&db_name, 2).expect("open 2");
-            req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-                evt.db().delete_object_store("s1")?;
-                Ok(())
-            }));
-            let db = req.await.expect("db await 2");
-            let stores: Vec<String> = db.object_store_names().collect();
-            let exp = vec![String::from("s2"); 1];
-
-            assert_eq!(stores, exp);
-        });
-
-        test_case!(async delete_by_name => {
-            async fn do_open(name: &str, v: u32, calls: Rc<RefCell<u8>>) -> IdbDatabase {
-                let mut req = IdbDatabase::open_u32(name, v).expect("open");
-                req.set_on_upgrade_needed(Some(move |_: &IdbVersionChangeEvent| {
-                    let curr = *calls.borrow();
-                    calls.replace(curr + 1);
-                    Ok(())
-                }));
-                req.await.expect("db await")
-            }
-
-            let db_name = db_name();
-            let calls = Rc::new(RefCell::new(0));
-
-            let db = do_open(&db_name, 1, calls.clone()).await;
-            db.delete().expect("Delete call").await.expect("delete promise");
-            do_open(&db_name, 1, calls.clone()).await;
-
-            assert_eq!(*calls.borrow(), 2);
-        });
-    }
-
-    pub mod tx_open {
-        test_mod_init!();
-
-        #[allow(clippy::needless_pass_by_value)]
-        fn check_transaction(
-            res: Result<IdbTransaction, DomException>,
-            mode: IdbTransactionMode,
-            exp: Vec<String>,
-        ) {
-            let tx = res.expect("tx open failed");
-            let mut stores: Vec<String> = tx.object_store_names().collect();
-            stores.sort();
-
-            assert_eq!(tx.mode(), mode, "Mode");
-            assert_eq!(stores, exp, "Stores");
-        }
-
-        async fn open_db() -> IdbDatabase {
-            let mut req = IdbDatabase::open(&db_name()).expect("open");
-            req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-                evt.db().create_object_store("s1")?;
-                evt.db().create_object_store("s2")?;
-                Ok(())
-            }));
-            req.await.expect("db await 1")
-        }
-
-        test_case!(async transaction_on_one => {
-            let db = open_db().await;
-            check_transaction(
-                db.transaction_on_one("s1"),
-                IdbTransactionMode::Readonly,
-                vec![String::from("s1")]
-            );
-        });
-
-        test_case!(async transaction_on_multi_with_one => {
-            let db = open_db().await;
-            check_transaction(
-                db.transaction_on_multi(&["s1"]),
-                IdbTransactionMode::Readonly,
-                vec![String::from("s1")]
-            );
-        });
-
-        test_case!(async transaction_on_multi_with_multi => {
-            let db = open_db().await;
-            check_transaction(
-                db.transaction_on_multi(&["s1", "s2"]),
-                IdbTransactionMode::Readonly,
-                vec![String::from("s1"), String::from("s2")]
-            );
-        });
-
-        test_case!(async transaction_on_one_with_mode_r => {
-            let db = open_db().await;
-            check_transaction(
-                db.transaction_on_one_with_mode("s2", IdbTransactionMode::Readonly),
-                IdbTransactionMode::Readonly,
-                vec![String::from("s2")]
-            );
-        });
-
-        test_case!(async transaction_on_one_with_mode_rw => {
-            let db = open_db().await;
-            check_transaction(
-                db.transaction_on_one_with_mode("s2", IdbTransactionMode::Readwrite),
-                IdbTransactionMode::Readwrite,
-                vec![String::from("s2")]
-            );
-        });
-    }
-
-    test_case!(async create_object_store_with_params => {
-        let mut req = IdbDatabase::open(&db_name()).expect("req");
-        req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-            evt.db().create_object_store_with_params(
-                "s1",
-                IdbObjectStoreParameters::new()
-                .auto_increment(true)
-                .key_path(Some(&IdbKeyPath::str("foo")))
-            )?;
-            Ok(())
-        }));
-        let db = req.await.expect("db");
-        let tx = db.transaction_on_one("s1").expect("tx");
-        let store = tx.object_store("s1").expect("store");
-
-        assert_eq!(store.key_path(), Some(IdbKeyPath::str("foo")), "key path");
-        assert!(store.auto_increment(), "auto_icrement");
-    });
-}
diff --git a/src/idb_database/idb_version_change_event.rs b/src/idb_database/idb_version_change_event.rs
deleted file mode 100644
index e062058..0000000
--- a/src/idb_database/idb_version_change_event.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use accessory::Accessors;
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{IdbOpenDbRequest, IdbRequest};
-
-use crate::idb_database::IdbDatabase;
-use crate::prelude::IdbTransaction;
-
-/// The DB version has changed
-#[derive(Debug, Accessors)]
-pub struct IdbVersionChangeEvent {
-    event: web_sys::IdbVersionChangeEvent,
-
-    /// Database associated with the version change
-    #[access(get)]
-    db: IdbDatabase,
-
-    req: IdbOpenDbRequest,
-}
-
-pub(crate) type IdbVersionChangeCallback =
-    Closure<dyn FnMut(web_sys::IdbVersionChangeEvent) -> Result<(), JsValue> + 'static>;
-
-impl IdbVersionChangeEvent {
-    pub(crate) fn new(event: web_sys::IdbVersionChangeEvent) -> Self {
-        let req: IdbOpenDbRequest = event
-            .target()
-            .expect("Failed to unwrap IdbOpenDbRequest event target")
-            .unchecked_into();
-        let base_db: web_sys::IdbDatabase = req
-            .result()
-            .expect("Failed to unwrap IdbOpenDbRequest result")
-            .unchecked_into();
-
-        Self {
-            event,
-            db: IdbDatabase::new(base_db),
-            req,
-        }
-    }
-
-    pub(crate) fn wrap_callback<F>(cb: F) -> IdbVersionChangeCallback
-    where
-        F: Fn(&Self) -> Result<(), JsValue> + 'static,
-    {
-        let b = Box::new(move |event: web_sys::IdbVersionChangeEvent| cb(&Self::new(event)));
-        Closure::wrap(b)
-    }
-
-    /// Old DB version; set to 0 on new DBs
-    #[inline]
-    #[must_use]
-    pub fn old_version(&self) -> f64 {
-        self.event.old_version()
-    }
-
-    /// New DB version
-    #[inline]
-    #[must_use]
-    pub fn new_version(&self) -> f64 {
-        self.event
-            .new_version()
-            .expect("Unable to unwrap new version")
-    }
-
-    /// Transaction associated with the version change
-    #[inline]
-    #[must_use]
-    pub fn transaction(&self) -> IdbTransaction {
-        let inner = self
-            .req
-            .unchecked_ref::<IdbRequest>()
-            .transaction()
-            .expect("Failed to unwrap IdbOpenDbRequest transaction");
-
-        IdbTransaction::new(inner, &self.db)
-    }
-}
-
-impl AsRef<IdbDatabase> for IdbVersionChangeEvent {
-    #[inline]
-    fn as_ref(&self) -> &IdbDatabase {
-        self.db()
-    }
-}
diff --git a/src/idb_index.rs b/src/idb_index.rs
deleted file mode 100644
index eae9694..0000000
--- a/src/idb_index.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-//! Index-related code
-
-use crate::idb_object_store::IdbObjectStore;
-use accessory::Accessors;
-use fancy_constructor::new;
-
-/// A wrapper around an [`IndexedDB` index](web_sys::IdbIndex)
-#[derive(Debug, new, Accessors)]
-#[new(vis(pub(crate)))]
-pub struct IdbIndex<'a> {
-    inner: web_sys::IdbIndex,
-
-    /// The index's object store
-    #[access(get(cp))]
-    object_store: &'a IdbObjectStore<'a>,
-}
-
-impl<'a> IdbIndex<'a> {
-    /// Affects how the index behaves when the result of evaluating the index's key path yields an
-    /// array. If true, there is one record in the index for each item in an array of keys.
-    /// If false, then there is one record for each key that is an array.
-    #[inline]
-    #[must_use]
-    pub fn multi_entry(&self) -> bool {
-        self.inner.multi_entry()
-    }
-
-    /// If true, this index does not allow duplicate values for a key.
-    #[inline]
-    #[must_use]
-    pub fn unique(&self) -> bool {
-        self.inner.unique()
-    }
-}
-
-impl_query_source!(IdbIndex<'_>);
diff --git a/src/idb_key_path.rs b/src/idb_key_path.rs
deleted file mode 100644
index 25ccc0d..0000000
--- a/src/idb_key_path.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::hash::{Hash, Hasher};
-
-use wasm_bindgen::{prelude::*, JsCast};
-
-use crate::internal_utils::arrayify_slice;
-
-/// A [key path](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Terminology#gloss_keypath)
-/// representation.
-#[derive(Debug, Clone, PartialEq)]
-pub struct IdbKeyPath(JsValue);
-
-impl IdbKeyPath {
-    /// Create a key path from a &str
-    #[inline]
-    #[must_use]
-    pub fn str(key_path: &str) -> Self {
-        Self::new(key_path.into())
-    }
-
-    /// Create a key path from a &str sequence
-    #[inline]
-    #[must_use]
-    pub fn str_sequence(key_paths: &[&str]) -> Self {
-        Self::new(arrayify_slice(key_paths).unchecked_into())
-    }
-
-    /// Create a key path from a [`JsValue`]. The value should be a JS string or array of strings.
-    #[inline]
-    #[must_use]
-    pub fn new(key_paths: JsValue) -> Self {
-        Self(key_paths)
-    }
-
-    /// The converted JS value
-    #[inline]
-    #[must_use]
-    pub fn as_js_value(&self) -> &JsValue {
-        &self.0
-    }
-
-    pub(crate) fn try_from_js(v: Result<JsValue, JsValue>) -> Option<Self> {
-        let v = v.ok()?;
-        if v.is_null() {
-            None
-        } else {
-            Some(Self::new(v))
-        }
-    }
-}
-
-impl AsRef<JsValue> for IdbKeyPath {
-    #[inline]
-    fn as_ref(&self) -> &JsValue {
-        self.as_js_value()
-    }
-}
-
-impl From<IdbKeyPath> for JsValue {
-    #[inline]
-    fn from(path: IdbKeyPath) -> Self {
-        path.0
-    }
-}
-
-impl From<JsValue> for IdbKeyPath {
-    #[inline]
-    fn from(val: JsValue) -> Self {
-        Self::new(val)
-    }
-}
-
-impl From<&str> for IdbKeyPath {
-    #[inline]
-    fn from(key_path: &str) -> Self {
-        Self::str(key_path)
-    }
-}
-
-impl From<&[&str]> for IdbKeyPath {
-    #[inline]
-    fn from(key_path: &[&str]) -> Self {
-        Self::str_sequence(key_path)
-    }
-}
-
-impl From<Vec<&str>> for IdbKeyPath {
-    #[inline]
-    fn from(key_path: Vec<&str>) -> Self {
-        Self::str_sequence(key_path.as_slice())
-    }
-}
-
-impl Hash for IdbKeyPath {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        if let Some(v) = self.as_js_value().as_string() {
-            state.write_u8(1);
-            v.hash(state);
-        } else {
-            state.write_u8(2);
-            hash_array(self.as_js_value().unchecked_ref(), state);
-        }
-    }
-}
-
-fn hash_array<H: Hasher>(arr: &js_sys::Array, h: &mut H) {
-    let len = arr.length();
-
-    h.write_u32(len);
-
-    for i in 0..len {
-        if let Some(v) = arr.get(i).as_string() {
-            h.write_u8(1);
-            v.hash(h);
-        } else {
-            h.write(&[0, 0]);
-        }
-    }
-}
diff --git a/src/idb_object_store.rs b/src/idb_object_store.rs
deleted file mode 100644
index 398f3a8..0000000
--- a/src/idb_object_store.rs
+++ /dev/null
@@ -1,326 +0,0 @@
-//! Object store-related code
-
-use accessory::Accessors;
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::DomException;
-
-pub use idb_object_store_parameters::*;
-
-#[cfg(feature = "indices")]
-use {
-    crate::{idb_index::IdbIndex, idb_key_path::IdbKeyPath},
-    web_sys::IdbIndexParameters,
-};
-
-use crate::idb_database::IdbDatabase;
-use crate::idb_transaction::IdbTransaction;
-use crate::request::VoidRequest;
-
-mod idb_object_store_parameters;
-
-/// An object store on a database
-#[derive(Debug, Accessors)]
-pub struct IdbObjectStore<'a> {
-    inner: web_sys::IdbObjectStore,
-
-    /// The DB that spawned this store
-    #[access(get(cp))]
-    db: &'a IdbDatabase,
-
-    /// The transaction that spawned this store
-    #[access(get(cp))]
-    transaction: Option<&'a IdbTransaction<'a>>,
-}
-
-impl<'a> IdbObjectStore<'a> {
-    /// Clear all the documents in the object store
-    pub fn clear(&self) -> Result<VoidRequest, DomException> {
-        Ok(VoidRequest::new(self.inner.clear()?))
-    }
-
-    /// Clone and store the value on the object store. Throws if the computed key already exists.
-    pub fn add_val<V: JsCast>(&self, val: &V) -> Result<VoidRequest, DomException> {
-        Ok(VoidRequest::new(self.inner.add(val.unchecked_ref())?))
-    }
-
-    /// Clone and store the value on the object store. Throws if the computed key already exists.
-    #[inline]
-    pub fn add_val_owned<V: Into<JsValue>>(&self, val: V) -> Result<VoidRequest, DomException> {
-        self.add_val(&val.into())
-    }
-
-    /// Clone and store the value in the object store at the given key. Throws if the key already
-    /// exists.
-    pub fn add_key_val<K, V>(&self, key: &K, val: &V) -> Result<VoidRequest, DomException>
-    where
-        K: JsCast,
-        V: JsCast,
-    {
-        let base = self
-            .inner
-            .add_with_key(val.unchecked_ref(), key.unchecked_ref())?;
-        Ok(VoidRequest::new(base))
-    }
-
-    /// Clone and store the value in the object store at the given key. Throws if the key already
-    /// exists.
-    #[inline]
-    pub fn add_key_val_owned<K, V>(&self, key: K, val: &V) -> Result<VoidRequest, DomException>
-    where
-        K: Into<JsValue>,
-        V: JsCast,
-    {
-        self.add_key_val(&key.into(), val)
-    }
-
-    /// Clone and store the value in the object store, overwriting any existing value.
-    pub fn put_val<V: JsCast>(&self, val: &V) -> Result<VoidRequest, DomException> {
-        Ok(VoidRequest::new(self.inner.put(val.unchecked_ref())?))
-    }
-
-    /// Clone and store the value in the object store, overwriting any existing value.
-    #[inline]
-    pub fn put_val_owned<V: Into<JsValue>>(&self, val: V) -> Result<VoidRequest, DomException> {
-        self.put_val(&val.into())
-    }
-
-    /// Clone and store the value in the object store at the given key, overwriting any existing
-    /// value.
-    pub fn put_key_val<K, V>(&self, key: &K, val: &V) -> Result<VoidRequest, DomException>
-    where
-        K: JsCast,
-        V: JsCast,
-    {
-        let base = self
-            .inner
-            .put_with_key(val.unchecked_ref(), key.unchecked_ref())?;
-        Ok(VoidRequest::new(base))
-    }
-
-    /// Clone and store the value in the object store at the given key, overwriting any existing
-    /// value.
-    #[inline]
-    pub fn put_key_val_owned<K, V>(&self, key: K, val: &V) -> Result<VoidRequest, DomException>
-    where
-        K: Into<JsValue>,
-        V: JsCast,
-    {
-        self.put_key_val(&key.into(), val)
-    }
-
-    /// The value of the auto increment flag for this object store.
-    #[inline]
-    #[must_use]
-    pub fn auto_increment(&self) -> bool {
-        self.inner.auto_increment()
-    }
-
-    #[inline]
-    pub(crate) fn from_db(inner: web_sys::IdbObjectStore, db: &'a IdbDatabase) -> Self {
-        Self {
-            inner,
-            db,
-            transaction: None,
-        }
-    }
-
-    #[inline]
-    pub(crate) fn from_tx(inner: web_sys::IdbObjectStore, tx: &'a IdbTransaction) -> Self {
-        Self {
-            inner,
-            db: tx.db(),
-            transaction: Some(tx),
-        }
-    }
-
-    /// Delete the record at the with the given key
-    pub fn delete<K: JsCast>(&self, key: &K) -> Result<VoidRequest, DomException> {
-        Ok(VoidRequest::new(self.inner.delete(key.unchecked_ref())?))
-    }
-
-    /// Delete the record at the with the given key
-    #[inline]
-    pub fn delete_owned<K: Into<JsValue>>(&self, key: K) -> Result<VoidRequest, DomException> {
-        self.delete(&key.into())
-    }
-}
-
-#[cfg(feature = "indices")]
-impl<'a> IdbObjectStore<'a> {
-    /// Open a named index in the current object store
-    #[inline]
-    pub fn index(&self, name: &str) -> Result<IdbIndex, DomException> {
-        Ok(IdbIndex::new(self.inner.index(name)?, self))
-    }
-
-    /// Destroy a named index in the current object store. Only usable within a version
-    /// change transaction.
-    #[inline]
-    pub fn delete_index(&self, name: &str) -> Result<(), DomException> {
-        Ok(self.inner.delete_index(name)?)
-    }
-
-    /// A list of the names of indices on objects in this object store.
-    #[inline]
-    #[must_use]
-    pub fn index_names(&self) -> impl ExactSizeIterator<Item = String> {
-        crate::dom_string_iterator::DomStringIterator::from(self.inner.index_names())
-    }
-
-    /// Create an index at the given key path
-    pub fn create_index(
-        &self,
-        name: &str,
-        key_path: &IdbKeyPath,
-    ) -> Result<IdbIndex, DomException> {
-        let base = self
-            .inner
-            .create_index_with_str_sequence(name, key_path.as_js_value());
-        self.create_idx_common(base)
-    }
-
-    /// Create an index at the given key path with the given parameters
-    pub fn create_index_with_params(
-        &self,
-        name: &str,
-        key_path: &IdbKeyPath,
-        params: &IdbIndexParameters,
-    ) -> Result<IdbIndex, DomException> {
-        let base = self
-            .inner
-            .create_index_with_str_sequence_and_optional_parameters(
-                name,
-                key_path.as_js_value(),
-                params,
-            );
-        self.create_idx_common(base)
-    }
-
-    fn create_idx_common(
-        &self,
-        src: Result<web_sys::IdbIndex, JsValue>,
-    ) -> Result<IdbIndex, DomException> {
-        Ok(IdbIndex::new(src?, self))
-    }
-}
-
-impl_query_source!(IdbObjectStore<'_>);
-
-#[cfg(test)]
-pub mod test {
-    use crate::idb_query_source::IdbQuerySource;
-    use crate::internal_utils::open_any_db;
-    use web_sys::IdbTransactionMode as TxMode;
-    test_mod_init!();
-
-    test_case!(async delete => {
-        let (db, store_name) = open_any_db().await;
-
-        let tx = db.transaction_on_one_with_mode(&store_name, TxMode::Readwrite).expect("tx1 open");
-        let store = tx.object_store(&store_name).expect("store1 open");
-
-        store.add_key_val_owned("foo", &JsValue::from("qux")).expect("add");
-        store.add_key_val_owned("bar", &JsValue::from("qux")).expect("add");
-        tx.await.into_result().expect("tx1_await");
-
-        let tx = db.transaction_on_one_with_mode(&store_name, TxMode::Readwrite).expect("tx2 open");
-        let store = tx.object_store(&store_name).expect("store2 open");
-        store.delete_owned("bar").expect("delete");
-        tx.await.into_result().expect("delete await");
-
-        let tx = db.transaction_on_one(&store_name).expect("tx3 open");
-        let store = tx.object_store(&store_name).expect("store 3 open");
-
-        let foo = store.get_owned("foo").expect("get_foo");
-        let bar = store.get_owned("bar").expect("get_bar");
-
-        let foo = foo.await.expect("get_foo await");
-        let bar = bar.await.expect("get_bar await");
-
-        assert_eq!(foo, Some(JsValue::from("qux")));
-        assert_eq!(bar, None);
-    });
-
-    test_case!(async clear => {
-        let (db, store_name) = open_any_db().await;
-
-        let tx = db.transaction_on_one_with_mode(&store_name, TxMode::Readwrite).expect("tx1 open");
-        let store = tx.object_store(&store_name).expect("store1 open");
-
-        store.add_key_val_owned("foo", &JsValue::from("bar")).expect("add");
-        tx.await.into_result().expect("tx1_await");
-
-        let tx = db.transaction_on_one_with_mode(&store_name, TxMode::Readwrite).expect("tx2 open");
-        let store = tx.object_store(&store_name).expect("store2 open");
-        store.clear().expect("clear").await.expect("clear await");
-
-        let tx = db.transaction_on_one(&store_name).expect("tx3 open");
-        let store = tx.object_store(&store_name).expect("store 3 open");
-        let all = store.get_all().expect("get_all").await.expect("get_all await");
-
-        assert_eq!(all.length(), 0, "length");
-    });
-
-    test_case!(async db_and_transaction => {
-        let (db, store_name) = open_any_db().await;
-        let tx = db.transaction_on_one(&store_name).expect("tx");
-        let store = tx.object_store(&store_name).expect("store");
-
-        assert!(store.transaction().is_some(), "tx");
-        assert_eq!(store.db().name(), db.name(), "db");
-    });
-
-    #[cfg(feature = "indices")]
-    pub mod indices {
-        use crate::prelude::*;
-        use uuid::Uuid;
-        test_mod_init!();
-
-        #[inline]
-        fn gen_names() -> [String; 2] {
-            [Uuid::new_v4().to_string(), Uuid::new_v4().to_string()]
-        }
-
-        test_case!(async index => {
-            let [db_name, store_name] = gen_names();
-            let mut req = crate::IdbDatabase::open(&db_name).expect("db open");
-            {
-                let store_name = store_name.clone();
-                req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-                    let store = evt.db().create_object_store(&store_name)?;
-                    store.create_index("created_idx", &IdbKeyPath::str("foo"))?;
-                    Ok(())
-                }));
-            }
-            let db = req.await.expect("db await");
-            let tx = db.transaction_on_one(&store_name).expect("tx");
-            let store = tx.object_store(&store_name).expect("store");
-            let idx = store.index("created_idx").expect("get idx");
-
-            assert_eq!(idx.name(), String::from("created_idx"));
-        });
-
-        test_case!(async index_names_and_deletion => {
-            let [db_name, store_name] = gen_names();
-            let mut req = crate::IdbDatabase::open(&db_name).expect("db open");
-            {
-                let store_name = store_name.clone();
-                req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-                  let store = evt.db().create_object_store(&store_name)?;
-                  store.create_index("idx1", &IdbKeyPath::str("foo"))?;
-                  store.create_index("idx2", &IdbKeyPath::str("foo"))?;
-                  store.create_index("idx3", &IdbKeyPath::str("foo"))?;
-                  store.delete_index("idx2")?;
-                  Ok(())
-                }));
-            }
-            let db = req.await.expect("db await");
-            let tx = db.transaction_on_one(&store_name).expect("tx");
-            let store = tx.object_store(&store_name).expect("store");
-            let mut idx_names: Vec<String> = store.index_names().collect();
-            idx_names.sort();
-
-            assert_eq!(idx_names, vec!["idx1", "idx3"]);
-        });
-    }
-}
diff --git a/src/idb_object_store/idb_object_store_parameters.rs b/src/idb_object_store/idb_object_store_parameters.rs
deleted file mode 100644
index 4d057e7..0000000
--- a/src/idb_object_store/idb_object_store_parameters.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::idb_key_path::IdbKeyPath;
-use delegate_display::DelegateDebug;
-use fancy_constructor::new;
-use web_sys::IdbObjectStoreParameters as Base;
-
-/// Wrapper for [`IdbObjectStore`](crate::idb_object_store::IdbObjectStore) optional parameters
-#[derive(DelegateDebug, Clone, new)]
-pub struct IdbObjectStoreParameters(#[new(val(Base::new()))] Base);
-
-impl IdbObjectStoreParameters {
-    /// Set the `auto_increment` option
-    #[inline]
-    pub fn auto_increment(&mut self, val: bool) -> &mut Self {
-        self.0.auto_increment(val);
-        self
-    }
-
-    /// Set the `key_path` option
-    pub fn key_path(&mut self, val: Option<&IdbKeyPath>) -> &mut Self {
-        self.0.key_path(val.map(IdbKeyPath::as_js_value));
-        self
-    }
-
-    /// Get the enclosed `web_sys` parameters object
-    #[inline]
-    #[must_use]
-    pub fn as_js_value(&self) -> &web_sys::IdbObjectStoreParameters {
-        self.0.as_ref()
-    }
-}
-
-impl AsRef<web_sys::IdbObjectStoreParameters> for IdbObjectStoreParameters {
-    #[inline]
-    fn as_ref(&self) -> &web_sys::IdbObjectStoreParameters {
-        self.as_js_value()
-    }
-}
-
-impl Default for IdbObjectStoreParameters {
-    #[inline]
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl From<web_sys::IdbObjectStoreParameters> for IdbObjectStoreParameters {
-    #[inline]
-    fn from(raw: web_sys::IdbObjectStoreParameters) -> Self {
-        Self(raw)
-    }
-}
diff --git a/src/idb_query_source.rs b/src/idb_query_source.rs
deleted file mode 100644
index 7f0ef8a..0000000
--- a/src/idb_query_source.rs
+++ /dev/null
@@ -1,243 +0,0 @@
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::DomException;
-
-use crate::idb_key_path::IdbKeyPath;
-use crate::request::{CountFuture, JsCastRequestFuture, OptionalJsValueFuture};
-#[cfg(feature = "cursors")]
-use crate::request::{IdbCursorFuture, IdbCursorWithValueFuture};
-
-/// Code shared between [indices](crate::idb_index::IdbIndex) and
-/// [object stores](crate::idb_object_store::IdbObjectStore)
-pub trait IdbQuerySource: Sized {
-    /// Get the index/object store name
-    fn name(&self) -> String;
-
-    /// Set the index/object store name
-    fn set_name(&self, name: &str);
-
-    /// Get the index/object store key path. Returns `None` if the index isn't auto-populated.
-    fn key_path(&self) -> Option<IdbKeyPath>;
-
-    /// Find either the value in the referenced object store that corresponds to the given key or
-    /// the first corresponding value, if key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    fn get<K: JsCast>(&self, key: &K) -> Result<OptionalJsValueFuture, DomException>;
-
-    /// Find either the value in the referenced object store that corresponds to the given key or
-    /// the first corresponding value, if key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    #[inline]
-    fn get_owned<K: Into<JsValue>>(&self, key: K) -> Result<OptionalJsValueFuture, DomException> {
-        self.get(&key.into())
-    }
-
-    /// Get all values in the index/object store
-    fn get_all(&self) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all values in the index/object store that correspond to the given key or are in
-    /// range, if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    fn get_all_with_key<K: JsCast>(
-        &self,
-        key: &K,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all values in the index/object store that correspond to the given key or are in
-    /// range, if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    #[inline]
-    fn get_all_with_key_owned<K: Into<JsValue>>(
-        &self,
-        key: K,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException> {
-        self.get_all_with_key(&key.into())
-    }
-
-    /// Get all values in the index/object store that correspond to the given key or are in
-    /// range, if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange). `limit` controls the
-    /// maximum number of results to return
-    fn get_all_with_key_and_limit<K: JsCast>(
-        &self,
-        key: &K,
-        limit: u32,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all values in the index/object store that correspond to the given key or are in
-    /// range, if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange). `limit` controls the
-    /// maximum number of results to return
-    fn get_all_with_key_and_limit_owned<K: Into<JsValue>>(
-        &self,
-        key: K,
-        limit: u32,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException> {
-        self.get_all_with_key_and_limit(&key.into(), limit)
-    }
-
-    /// Count the number of documents in the index/object store
-    fn count(&self) -> Result<CountFuture, DomException>;
-
-    /// Count the number of documents in the index/object store within the given key range
-    fn count_with_key<K: JsCast>(&self, key: &K) -> Result<CountFuture, DomException>;
-
-    /// Count the number of documents in the index/object store within the given key range
-    #[inline]
-    fn count_with_key_owned<K: Into<JsValue>>(&self, key: K) -> Result<CountFuture, DomException> {
-        self.count_with_key(&key.into())
-    }
-
-    /// Find either the given key or the primary key, if key is an
-    /// [`IDBKeyRange`](web_sys::IdbKeyRange).
-    fn get_key<K: JsCast>(&self, key: &K) -> Result<OptionalJsValueFuture, DomException>;
-
-    /// Find either the given key or the primary key, if key is an
-    /// [`IDBKeyRange`](web_sys::IdbKeyRange).
-    #[inline]
-    fn get_key_owned<K>(&self, key: K) -> Result<OptionalJsValueFuture, DomException>
-    where
-        K: JsCast,
-    {
-        self.get_key(&key.into())
-    }
-
-    /// Get all the keys in the index/object store
-    fn get_all_keys(&self) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all the keys in the index/object store that correspond to the given key or are in range
-    /// if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    fn get_all_keys_with_key<K: JsCast>(
-        &self,
-        key: &K,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all the keys in the index/object store that correspond to the given key or are in range
-    /// if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange).
-    #[inline]
-    fn get_all_keys_with_key_owned<K: Into<JsValue>>(
-        &self,
-        key: K,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException> {
-        self.get_all_keys_with_key(&key.into())
-    }
-
-    /// Get all the keys in the index/object store that correspond to the given key or are in range
-    /// if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange), up to the given limit.
-    fn get_all_keys_with_key_and_limit<K: JsCast>(
-        &self,
-        key: &K,
-        limit: u32,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException>;
-
-    /// Get all the keys in the index/object store that correspond to the given key or are in range
-    /// if the key is an [`IDBKeyRange`](web_sys::IdbKeyRange), up to the given limit.
-    fn get_all_keys_with_key_and_limit_owned<K: Into<JsValue>>(
-        &self,
-        key: K,
-        limit: u32,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException> {
-        self.get_all_keys_with_key_and_limit(&key.into(), limit)
-    }
-
-    /// Get all the keys in the index/object store, up to the given limit.
-    #[inline]
-    fn get_all_keys_with_limit(
-        &self,
-        limit: u32,
-    ) -> Result<JsCastRequestFuture<js_sys::Array>, DomException> {
-        self.get_all_keys_with_key_and_limit(&JsValue::undefined(), limit)
-    }
-
-    /// Open a cursor
-    #[cfg(feature = "cursors")]
-    fn open_cursor(&self) -> Result<IdbCursorWithValueFuture<Self>, DomException>;
-
-    /// Open a cursor with the given key range
-    #[cfg(feature = "cursors")]
-    fn open_cursor_with_range<K: JsCast>(
-        &self,
-        range: &K,
-    ) -> Result<IdbCursorWithValueFuture<Self>, DomException>;
-
-    /// Open a cursor with the given key range
-    #[cfg(feature = "cursors")]
-    #[inline]
-    fn open_cursor_with_range_owned<K: Into<JsValue>>(
-        &self,
-        range: K,
-    ) -> Result<IdbCursorWithValueFuture<Self>, DomException> {
-        self.open_cursor_with_range(&range.into())
-    }
-
-    /// Open a cursor with the given key range and direction
-    #[cfg(feature = "cursors")]
-    fn open_cursor_with_range_and_direction<K: JsCast>(
-        &self,
-        range: &K,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorWithValueFuture<Self>, DomException>;
-
-    /// Open a cursor with the given key range and direction
-    #[cfg(feature = "cursors")]
-    #[inline]
-    fn open_cursor_with_range_and_direction_owned<K: Into<JsValue>>(
-        &self,
-        range: K,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorWithValueFuture<Self>, DomException> {
-        self.open_cursor_with_range_and_direction(&range.into(), direction)
-    }
-
-    /// Open a cursor with the given and direction
-    #[cfg(feature = "cursors")]
-    #[inline]
-    fn open_cursor_with_direction(
-        &self,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorWithValueFuture<Self>, DomException> {
-        self.open_cursor_with_range_and_direction(&JsValue::undefined(), direction)
-    }
-
-    /// Open a key cursor
-    #[cfg(feature = "cursors")]
-    fn open_key_cursor(&self) -> Result<IdbCursorFuture<Self>, DomException>;
-
-    /// Open a key cursor with the given key range
-    #[cfg(feature = "cursors")]
-    fn open_key_cursor_with_range<K: JsCast>(
-        &self,
-        range: &K,
-    ) -> Result<IdbCursorFuture<Self>, DomException>;
-
-    /// Open a key cursor with the given key range
-    #[cfg(feature = "cursors")]
-    #[inline]
-    fn open_key_cursor_with_range_owned<K: Into<JsValue>>(
-        &self,
-        range: K,
-    ) -> Result<IdbCursorFuture<Self>, DomException> {
-        self.open_key_cursor_with_range(&range.into())
-    }
-
-    /// Open a key cursor with the given key range and direction
-    #[cfg(feature = "cursors")]
-    fn open_key_cursor_with_range_and_direction<K: JsCast>(
-        &self,
-        range: &K,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorFuture<Self>, DomException>;
-
-    /// Open a key cursor with the given key range and direction
-    #[cfg(feature = "cursors")]
-    fn open_key_cursor_with_range_and_direction_owned<K: Into<JsValue>>(
-        &self,
-        range: K,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorFuture<Self>, DomException> {
-        self.open_key_cursor_with_range_and_direction(&range.into(), direction)
-    }
-
-    /// Open a key cursor with the given and direction
-    #[cfg(feature = "cursors")]
-    #[inline]
-    fn open_key_cursor_with_direction(
-        &self,
-        direction: web_sys::IdbCursorDirection,
-    ) -> Result<IdbCursorFuture<Self>, DomException> {
-        self.open_key_cursor_with_range_and_direction(&JsValue::undefined(), direction)
-    }
-}
diff --git a/src/idb_transaction.rs b/src/idb_transaction.rs
deleted file mode 100644
index c4e24a8..0000000
--- a/src/idb_transaction.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-//! Transaction-related code
-
-use std::fmt::Debug;
-use std::future::{Future, IntoFuture};
-
-use accessory::Accessors;
-use fancy_constructor::new;
-use web_sys::{DomException, IdbTransactionMode};
-
-pub use idb_transaction_future::IdbTransactionFuture;
-pub(crate) use idb_transaction_listeners::*;
-pub use idb_transaction_result::*;
-
-use crate::dom_string_iterator::DomStringIterator;
-use crate::idb_database::IdbDatabase;
-use crate::idb_object_store::IdbObjectStore;
-
-mod idb_transaction_future;
-mod idb_transaction_listeners;
-mod idb_transaction_result;
-
-/// Wrapper around an `IndexedDB` transaction
-#[derive(Debug, new, Accessors)]
-#[new(vis(pub(crate)))]
-pub struct IdbTransaction<'db> {
-    #[new(val(IdbTransactionListeners::new(&inner)))]
-    listeners: IdbTransactionListeners,
-    inner: web_sys::IdbTransaction,
-
-    #[access(get(cp))]
-    /// The database connection with which this transaction is associated.
-    db: &'db IdbDatabase,
-}
-
-impl IdbTransaction<'_> {
-    /// Get a iterator of the names of [`IdbObjectStore`] objects associated with the transaction.
-    #[inline]
-    pub fn object_store_names(&self) -> impl Iterator<Item = String> {
-        DomStringIterator::from(self.inner.object_store_names())
-    }
-
-    /// The mode for isolating access to data in the object stores that are in the scope of the
-    /// transaction.
-    #[inline]
-    #[must_use]
-    pub fn mode(&self) -> IdbTransactionMode {
-        self.inner.mode().unwrap()
-    }
-
-    /// Return a `DOMException` indicating the type of error that occurred when there is an
-    /// unsuccessful transaction. This property is `None` if the transaction is not finished, is
-    /// finished and successfully committed, or was aborted with `abort()` function.
-    #[inline]
-    #[must_use]
-    pub fn error(&self) -> Option<DomException> {
-        self.inner.error()
-    }
-
-    /// Rolls back all the changes to objects in the database associated with this transaction.
-    /// If this transaction has been aborted or completed, this method fires an error event.
-    #[inline]
-    pub fn abort(self) -> Result<(), DomException> {
-        Ok(self.inner.abort()?)
-    }
-}
-
-impl<'db> IdbTransaction<'db> {
-    /// Returns an [`IdbObjectStore`] object representing an object store that is part of the scope
-    /// of this transaction.
-    pub fn object_store(&'db self, name: &str) -> Result<IdbObjectStore<'db>, DomException> {
-        let tx = self.inner.object_store(name)?;
-        Ok(IdbObjectStore::from_tx(tx, self))
-    }
-}
-
-impl Drop for IdbTransaction<'_> {
-    fn drop(&mut self) {
-        self.inner.set_oncomplete(None);
-        self.inner.set_onerror(None);
-        self.inner.set_onabort(None);
-    }
-}
-
-impl<'a> IntoFuture for IdbTransaction<'a> {
-    type Output = <IdbTransactionFuture<'a> as Future>::Output;
-
-    type IntoFuture = IdbTransactionFuture<'a>;
-
-    #[inline]
-    fn into_future(self) -> Self::IntoFuture {
-        IdbTransactionFuture::new(self)
-    }
-}
-
-#[cfg(test)]
-pub mod test {
-    pub mod future {
-        use crate::internal_utils::open_any_db;
-        use crate::prelude::{IdbTransactionMode, IdbTransactionResult};
-
-        test_mod_init!();
-
-        test_case!(async should_return_object_store_names => {
-            let (db, store_name) = open_any_db().await;
-            let tx = db.transaction_on_multi(&[store_name.as_str()]).expect("tx");
-            let store_names: Vec<String> = tx.object_store_names().collect();
-
-            assert_eq!(store_names, vec![store_name; 1]);
-        });
-
-        test_case!(async should_resolve_on_success => {
-            let (db, store_name) = open_any_db().await;
-            let tx = db.transaction_on_one_with_mode(&store_name, IdbTransactionMode::Readwrite).expect("tx");
-            let store = tx.object_store(&store_name).expect("store");
-
-            store.put_key_val_owned("foo", &JsValue::from("bar")).expect("put");
-            assert!(tx.await.into_result().is_ok(), "result");
-        });
-
-        test_case!(async should_propagate_errors => {
-            let (db, store_name) = open_any_db().await;
-            let tx = db.transaction_on_one_with_mode(&store_name, IdbTransactionMode::Readwrite).expect("tx");
-            let store = tx.object_store(&store_name).expect("store");
-
-            store.add_key_val_owned("foo", &JsValue::from("bar")).expect("put 1");
-            store.add_key_val_owned("foo", &JsValue::from("qux")).expect("put 2");
-            match tx.await {
-                IdbTransactionResult::Abort => panic!("Aborted"),
-                IdbTransactionResult::Success => panic!("Didn't error"),
-                IdbTransactionResult::Error(_) => {
-                    // Pass; don't check error message as it differs across browsers
-                }
-            };
-        });
-    }
-}
diff --git a/src/idb_transaction/idb_transaction_future.rs b/src/idb_transaction/idb_transaction_future.rs
deleted file mode 100644
index fdb8a01..0000000
--- a/src/idb_transaction/idb_transaction_future.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use super::{IdbTransaction, IdbTransactionResult};
-use fancy_constructor::new;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-/// A future that resolves once the transaction completes
-#[derive(new)]
-#[new(vis(pub(crate)))]
-pub struct IdbTransactionFuture<'a> {
-    tx: IdbTransaction<'a>,
-}
-
-impl<'a> Future for IdbTransactionFuture<'a> {
-    type Output = IdbTransactionResult;
-
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        if let Some(ref v) = *self.tx.listeners.result.borrow() {
-            Poll::Ready(v.clone())
-        } else {
-            self.tx
-                .listeners
-                .waker
-                .borrow_mut()
-                .replace(ctx.waker().clone());
-            Poll::Pending
-        }
-    }
-}
diff --git a/src/idb_transaction/idb_transaction_listeners.rs b/src/idb_transaction/idb_transaction_listeners.rs
deleted file mode 100644
index 49156ad..0000000
--- a/src/idb_transaction/idb_transaction_listeners.rs
+++ /dev/null
@@ -1,107 +0,0 @@
-use std::cell::RefMut;
-use std::{cell::RefCell, rc::Rc, task::Waker};
-
-use wasm_bindgen::{prelude::*, JsCast};
-
-use crate::internal_utils::{create_lazy_ref_cell, wake};
-
-use super::IdbTransactionResult;
-
-type Cb = dyn Fn() + 'static;
-type ErrCb = dyn Fn(web_sys::Event) + 'static;
-type WakerRef = Rc<RefCell<Option<Waker>>>;
-type ResultRef = Rc<RefCell<Option<IdbTransactionResult>>>;
-
-/// `IdbTransaction` event listeners
-#[derive(Debug)]
-pub(crate) struct IdbTransactionListeners {
-    pub(crate) waker: WakerRef,
-    pub(crate) result: ResultRef,
-    _on_success: Closure<Cb>,
-    _on_abort: Closure<Cb>,
-    _on_error: Closure<ErrCb>,
-}
-
-impl IdbTransactionListeners {
-    pub fn new(inner: &web_sys::IdbTransaction) -> Self {
-        let waker = create_lazy_ref_cell();
-        let result = create_lazy_ref_cell();
-
-        let on_success =
-            base_callback(waker.clone(), result.clone(), IdbTransactionResult::Success);
-        let on_error = error_callback(waker.clone(), result.clone());
-        let on_abort = base_callback(waker.clone(), result.clone(), IdbTransactionResult::Abort);
-
-        inner.set_oncomplete(Some(on_success.as_ref().unchecked_ref()));
-        inner.set_onerror(Some(on_error.as_ref().unchecked_ref()));
-        inner.set_onabort(Some(on_abort.as_ref().unchecked_ref()));
-
-        Self {
-            waker,
-            result,
-            _on_error: on_error,
-            _on_success: on_success,
-            _on_abort: on_abort,
-        }
-    }
-}
-
-fn try_get_result_ref(result: &ResultRef) -> Option<RefMut<Option<IdbTransactionResult>>> {
-    if let Ok(v) = result.try_borrow_mut() {
-        if v.is_none() {
-            return Some(v);
-        }
-    }
-    None
-}
-
-fn error_callback(waker: WakerRef, result: ResultRef) -> Closure<ErrCb> {
-    #[allow(clippy::needless_pass_by_value)]
-    fn extract_error(evt: web_sys::Event) -> Option<web_sys::DomException> {
-        if let Some(tgt) = evt.target() {
-            let req: web_sys::IdbRequest = tgt.unchecked_into();
-            req.error()
-                .expect("Error unreachable on an errored transaction")
-        } else {
-            None
-        }
-    }
-
-    /// Returns true if the waker should be called
-    fn process(evt: web_sys::Event, result: &ResultRef) -> bool {
-        if let Some(mut res) = try_get_result_ref(result) {
-            if let Some(err) = extract_error(evt) {
-                res.replace(IdbTransactionResult::Error(err));
-
-                return true;
-            }
-        }
-        false
-    }
-    let b = Box::new(move |e: web_sys::Event| {
-        if process(e, &result) {
-            wake(&waker);
-        }
-    });
-    Closure::wrap(b)
-}
-
-fn base_callback(waker: WakerRef, result: ResultRef, kind: IdbTransactionResult) -> Closure<Cb> {
-    /// Returns true if the waker should be called
-    fn process(result: &ResultRef, kind: &IdbTransactionResult) -> bool {
-        if let Some(mut v) = try_get_result_ref(result) {
-            v.replace(kind.clone());
-            true
-        } else {
-            false
-        }
-    }
-
-    let b = Box::new(move || {
-        if process(&result, &kind) {
-            // Clone so this can be Fn and not FnOnce
-            wake(&waker);
-        }
-    });
-    Closure::wrap(b)
-}
diff --git a/src/idb_transaction/idb_transaction_result.rs b/src/idb_transaction/idb_transaction_result.rs
deleted file mode 100644
index 6662d31..0000000
--- a/src/idb_transaction/idb_transaction_result.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use web_sys::DomException;
-
-/// The [transaction's](crate::idb_transaction::IdbTransaction) result
-#[derive(Debug, Clone)]
-pub enum IdbTransactionResult {
-    /// Transaction committed successfully
-    Success,
-    /// Transaction errored
-    Error(DomException),
-    /// Transaction aborted
-    Abort,
-}
-
-impl IdbTransactionResult {
-    /// Convert the transaction into a [Result]
-    pub fn into_result(self) -> Result<(), DomException> {
-        match self {
-            IdbTransactionResult::Success => Ok(()),
-            IdbTransactionResult::Error(xc) => Err(xc),
-            IdbTransactionResult::Abort => {
-                let xc = DomException::new_with_message("Transaction aborted")
-                    .expect("Failed to construct abort event dom exception");
-                Err(xc)
-            }
-        }
-    }
-}
-
-impl From<IdbTransactionResult> for Result<(), DomException> {
-    #[inline]
-    fn from(value: IdbTransactionResult) -> Self {
-        value.into_result()
-    }
-}
diff --git a/src/index.rs b/src/index.rs
new file mode 100644
index 0000000..c4a7056
--- /dev/null
+++ b/src/index.rs
@@ -0,0 +1,37 @@
+//! An [`IDBIndex`](https://developer.mozilla.org/en-US/docs/Web/API/IDBIndex) implementation.
+
+use accessory::Accessors;
+use fancy_constructor::new;
+pub use index_builder::IndexBuilder;
+
+mod object_store_ext;
+
+mod index_builder;
+
+use crate::object_store::ObjectStore;
+
+/// An [`IDBIndex`](https://developer.mozilla.org/en-US/docs/Web/API/IDBIndex) implementation.
+#[derive(Debug, Clone, Accessors, new)]
+#[new(vis())]
+pub struct Index<'a> {
+    /// The object store this index is for.
+    #[access(get(cp))]
+    object_store: &'a ObjectStore<'a>,
+    base: web_sys::IdbIndex,
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for Index<'_> {
+    type Repr = web_sys::IdbIndex;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.base
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.base
+    }
+}
diff --git a/src/index/index_builder.rs b/src/index/index_builder.rs
new file mode 100644
index 0000000..fa75b49
--- /dev/null
+++ b/src/index/index_builder.rs
@@ -0,0 +1,138 @@
+use super::Index;
+use crate::error::Error;
+use crate::internal_utils::SystemRepr;
+use crate::object_store::ObjectStore;
+use crate::KeyPath;
+use internal_macros::generic_bounds;
+use sealed::sealed;
+
+/// Builder for [`ObjectStore::create_index`].
+///
+/// Finalise with a call to [`Build::build`](crate::Build::build).
+#[must_use]
+pub struct IndexBuilder<'a, N, KP, U = (), ME = ()> {
+    store: &'a ObjectStore<'a>,
+    name: N,
+    key_path: KeyPath<KP>,
+    unique: U,
+    multi_entry: ME,
+}
+
+impl<'a, N, KP> IndexBuilder<'a, N, KP> {
+    #[generic_bounds(index_name(N), key_path(KP))]
+    #[inline]
+    pub(super) fn new(store: &'a ObjectStore<'a>, name: N, key_path: KeyPath<KP>) -> Self {
+        Self {
+            store,
+            name,
+            key_path,
+            unique: (),
+            multi_entry: (),
+        }
+    }
+}
+
+impl<'a, N, KP, U, ME> IndexBuilder<'a, N, KP, U, ME> {
+    /// If true, the index will not allow duplicate values for a single key.
+    ///
+    /// Defaults to `false`.
+    #[inline]
+    pub fn with_unique(self, unique: bool) -> IndexBuilder<'a, N, KP, bool, ME> {
+        IndexBuilder {
+            store: self.store,
+            name: self.name,
+            key_path: self.key_path,
+            unique,
+            multi_entry: self.multi_entry,
+        }
+    }
+
+    /// If `true`, the index will add an entry in the index for each array element when the key path resolves to an
+    /// array. If `false`, it will add one single entry containing the array.
+    ///
+    /// Defaults to `false`.
+    #[inline]
+    pub fn with_multi_entry(self, multi_entry: bool) -> IndexBuilder<'a, N, KP, U, bool> {
+        IndexBuilder {
+            store: self.store,
+            name: self.name,
+            key_path: self.key_path,
+            unique: self.unique,
+            multi_entry,
+        }
+    }
+
+    #[generic_bounds(index_name(N), key_path(KP))]
+    fn build_with_params(&self, params: &web_sys::IdbIndexParameters) -> crate::Result<Index<'a>> {
+        let kp = self.key_path.to_js();
+        let sys = self
+            .store
+            .as_sys()
+            .create_index_with_str_sequence_and_optional_parameters(
+                self.name.as_ref(),
+                &kp,
+                params,
+            )?;
+
+        Ok(Index::new(self.store, sys))
+    }
+}
+
+#[generic_bounds(index_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for IndexBuilder<'a, N, KP> {
+    type Ok = Index<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let kp = self.key_path.to_js();
+        let sys = self
+            .store
+            .as_sys()
+            .create_index_with_str_sequence(self.name.as_ref(), &kp)?;
+        Ok(Index::new(self.store, sys))
+    }
+}
+
+#[generic_bounds(index_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for IndexBuilder<'a, N, KP, bool> {
+    type Ok = Index<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbIndexParameters::new();
+        p.set_unique(self.unique);
+
+        self.build_with_params(&p)
+    }
+}
+
+#[generic_bounds(index_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for IndexBuilder<'a, N, KP, (), bool> {
+    type Ok = Index<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbIndexParameters::new();
+        p.set_multi_entry(self.multi_entry);
+
+        self.build_with_params(&p)
+    }
+}
+
+#[generic_bounds(index_name(N), key_path(KP))]
+#[sealed]
+impl<'a, N, KP> crate::Build for IndexBuilder<'a, N, KP, bool, bool> {
+    type Ok = Index<'a>;
+    type Err = Error;
+
+    fn build(self) -> Result<Self::Ok, Self::Err> {
+        let p = web_sys::IdbIndexParameters::new();
+        p.set_unique(self.unique);
+        p.set_multi_entry(self.multi_entry);
+
+        self.build_with_params(&p)
+    }
+}
diff --git a/src/index/object_store_ext.rs b/src/index/object_store_ext.rs
new file mode 100644
index 0000000..3735621
--- /dev/null
+++ b/src/index/object_store_ext.rs
@@ -0,0 +1,52 @@
+pub use super::{Index, IndexBuilder};
+use internal_macros::{errdoc, generic_bounds};
+
+use crate::internal_utils::SystemRepr;
+use crate::iter::DomStringIter;
+use crate::object_store::ObjectStore;
+use crate::KeyPath;
+
+impl ObjectStore<'_> {
+    /// Create and return a new index on the connected database. Note that this method must be called only from a
+    /// [`VersionChange`](crate::transaction::TransactionMode::Versionchange) transaction mode callback.
+    ///
+    /// You'll want to set the key path to a [`KeyPath`](crate::KeyPathOld) or `&KeyPath`.
+    #[errdoc(Index(
+        ConstraintError,
+        InvalidStateError,
+        SyntaxError,
+        TransactionInactiveError
+    ))]
+    #[generic_bounds(index_name(N), key_path(KP))]
+    #[inline]
+    pub fn create_index<N, KP>(&self, name: N, key_path: KeyPath<KP>) -> IndexBuilder<N, KP> {
+        IndexBuilder::new(self, name, key_path)
+    }
+
+    /// Delete the index with the given name. Must me called within a
+    /// [`Versionchange`](crate::transaction::TransactionMode::Versionchange) transaction.
+    #[errdoc(Index(InvalidStateError, TransactionInactiveError, NotFoundError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn delete_index(&self, name: &str) -> crate::Result<()> {
+        if let Err(e) = self.as_sys().delete_index(name) {
+            Err(e.into())
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Open an index with the given name
+    #[errdoc(Index(InvalidStateErrorIndex, NotFoundError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn index(&self, name: &str) -> crate::Result<Index> {
+        match self.as_sys().index(name) {
+            Ok(sys) => Ok(Index::new(self, sys)),
+            Err(e) => Err(e.into()),
+        }
+    }
+
+    /// Return the names of the indices on this object store.
+    pub fn index_names(&self) -> DomStringIter {
+        DomStringIter::new(self.as_sys().index_names())
+    }
+}
diff --git a/src/internal_utils.rs b/src/internal_utils.rs
index cd1b32d..8f60420 100644
--- a/src/internal_utils.rs
+++ b/src/internal_utils.rs
@@ -1,129 +1,46 @@
-use std::cell::RefCell;
-
-use std::rc::Rc;
-use std::task::Waker;
-
-use cfg_if::cfg_if;
+use sealed::sealed;
 use wasm_bindgen::prelude::*;
 
-/// `unwrap_unchecked` if running in nightly, else just unwrap
-pub(crate) trait NightlyUnwrap<T> {
-    fn nightly_unwrap(self) -> T;
-}
+pub use internal_macros::StructName;
 
-impl<T> NightlyUnwrap<T> for Option<T> {
-    fn nightly_unwrap(self) -> T {
-        cfg_if! {
-            if #[cfg(feature = "nightly")] {
-                unsafe { self.unwrap_unchecked() }
-            } else {
-                self.unwrap()
-            }
-        }
-    }
+/// Marker type equivalent to `()` that's neither [`TryToJs`](crate::primitive::TryToJs) nor
+/// [`TryFromJs`](crate::primitive::TryFromJs) nor [`Serialize`](serde::Serialize) nor
+/// [`Deserialize`](serde::Deserialize).
+#[derive(Copy, Clone, Debug)]
+pub struct Void();
+impl Void {
+    pub(crate) const VOID: Void = Void {};
 }
 
-impl<T, E: std::fmt::Debug> NightlyUnwrap<T> for Result<T, E> {
-    fn nightly_unwrap(self) -> T {
-        cfg_if! {
-            if #[cfg(feature = "nightly")] {
-                unsafe { self.unwrap_unchecked() }
-            } else {
-                self.unwrap()
-            }
-        }
-    }
+pub(crate) trait StructName {
+    const TYPE_NAME: &'static str;
 }
 
-#[cfg(test)]
-pub(crate) async fn open_any_db() -> (crate::IdbDatabase, String) {
-    use crate::prelude::*;
-
-    let db = uuid::Uuid::new_v4().to_string();
-    let store = uuid::Uuid::new_v4().to_string();
-    let mut req = IdbDatabase::open(&db).expect("db open");
-    let store_cloned = store.clone();
-    req.set_on_upgrade_needed(Some(move |evt: &IdbVersionChangeEvent| {
-        evt.db().create_object_store(&store_cloned)?;
-        Ok(())
-    }));
+/// Internal [`web_sys`]-based representation.
+#[sealed(pub(crate))]
+pub trait SystemRepr {
+    /// Internal [`web_sys`]-based representation type.
+    type Repr: JsCast;
 
-    (req.await.expect("fut"), store)
-}
+    /// Get the base representation. Using this fn to bypass the library can lead to unaccounted for errors.
+    #[must_use]
+    #[doc(hidden)]
+    fn as_sys(&self) -> &Self::Repr;
 
-/// Wake the given option ref cell
-pub(crate) fn wake(waker: &RefCell<Option<Waker>>) {
-    if let Some(ref w) = *waker.borrow() {
-        w.wake_by_ref();
-    }
+    /// Convert into the base representation. Using this fn to bypass the library can lead to unaccounted for errors.
+    #[must_use]
+    #[doc(hidden)]
+    fn into_sys(self) -> Self::Repr;
 }
 
-/// Return `None` if `val` is undefined, else `Some(val)`
-#[inline]
-pub(crate) fn optional_jsvalue_undefined(val: JsValue) -> Option<JsValue> {
-    if val.is_undefined() {
-        None
-    } else {
-        Some(val)
+pub(crate) fn slice_to_arr<I, T>(slice: I) -> js_sys::Array
+where
+    I: IntoIterator<Item = T>,
+    T: AsRef<str>,
+{
+    fn jsval_from_asref<T: AsRef<str>>(v: T) -> JsValue {
+        JsValue::from_str(v.as_ref())
     }
-}
 
-#[inline]
-pub(crate) fn create_lazy_ref_cell<T>() -> Rc<RefCell<Option<T>>> {
-    Rc::new(RefCell::new(None))
-}
-
-pub(crate) fn arrayify_slice(slice: &[&str]) -> js_sys::Array {
-    slice.iter().map(move |v| JsValue::from_str(v)).collect()
-}
-
-#[cfg(test)]
-pub mod test {
-    use super::*;
-
-    pub mod arrayify_slice {
-        use js_sys::Array;
-
-        test_mod_init!();
-
-        fn assert_array_eq(arr: &Array, slice: &[&str]) {
-            let arr_length = arr.length();
-            assert_eq!(arr.length() as usize, slice.len(), "Lengths");
-            for i in 0..arr_length {
-                assert_eq!(
-                    arr.get(i),
-                    JsValue::from_str(slice[i as usize]),
-                    "Item at idx {}",
-                    i
-                );
-            }
-        }
-
-        test_case!(empty_slice => {
-            assert_array_eq(&Array::new(), &[]);
-        });
-
-        test_case!(non_empty_slice => {
-            assert_array_eq(&Array::of2(&"foo".into(), &"bar".into()), &["foo", "bar"]);
-        });
-    }
-
-    pub mod optional_jsvalue_undefined {
-        test_mod_init!();
-
-        macro_rules! run_case {
-            ($name: ident, $val: expr, $expect: literal) => {
-                test_case!($name => {
-                    let val = optional_jsvalue_undefined($val).is_none();
-                    assert_eq!(val, $expect);
-                });
-            };
-        }
-
-        run_case!(undefined, JsValue::undefined(), true);
-        run_case!(null, JsValue::null(), false);
-        run_case!(string, JsValue::from_str("foo"), false);
-        run_case!(num_0, JsValue::from(0), false);
-        run_case!(bool_false, JsValue::from(false), false);
-    }
+    slice.into_iter().map(jsval_from_asref).collect()
 }
diff --git a/src/internals.rs b/src/internals.rs
new file mode 100644
index 0000000..315bad0
--- /dev/null
+++ b/src/internals.rs
@@ -0,0 +1,29 @@
+//! Internal type representations
+
+pub use crate::database::db_sys::DbSys;
+pub use crate::internal_utils::{SystemRepr, Void};
+pub use crate::object_store::add_put::kind::InsertKind;
+pub use crate::query_source::get_all::kind::GetAllKind;
+pub use crate::query_source::internal::QuerySourceInternal;
+
+#[cfg(feature = "cursors")]
+pub use crate::{
+    cursor::cursor_sys::CursorSys, future::cursor::CursorKind as CursorFutureKind,
+    query_source::cursor::kind::CursorKind,
+};
+
+#[allow(missing_docs)]
+pub mod record_insert_kind {
+    pub use crate::object_store::add_put::kind::{Add, Put};
+}
+
+#[allow(missing_docs)]
+pub mod get_all_kind {
+    pub use crate::query_source::get_all::kind::{Key, Record};
+}
+
+#[cfg(feature = "cursors")]
+#[allow(missing_docs)]
+pub mod cursor_kind {
+    pub use crate::query_source::cursor::kind::{Key, Record};
+}
diff --git a/src/iter/array_map.rs b/src/iter/array_map.rs
new file mode 100644
index 0000000..e10df31
--- /dev/null
+++ b/src/iter/array_map.rs
@@ -0,0 +1,54 @@
+use crate::error::Error;
+use fancy_constructor::new;
+use std::iter::FusedIterator;
+use wasm_bindgen::prelude::*;
+
+/// An iterator that maps [js array](js_sys::Array) values.
+#[derive(new)]
+#[new(vis(pub(crate)))]
+#[must_use]
+pub struct ArrayMapIter<T, E = Error> {
+    src: js_sys::ArrayIntoIter,
+    mapper: fn(JsValue) -> Result<T, E>,
+}
+
+impl<T, E> Iterator for ArrayMapIter<T, E> {
+    type Item = Result<T, E>;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        self.src.next().map(self.mapper)
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.src.size_hint()
+    }
+
+    #[inline]
+    fn count(self) -> usize {
+        self.src.count()
+    }
+
+    fn last(self) -> Option<Self::Item> {
+        self.src.last().map(self.mapper)
+    }
+
+    fn nth(&mut self, n: usize) -> Option<Self::Item> {
+        self.src.nth(n).map(self.mapper)
+    }
+}
+
+impl<T, E> DoubleEndedIterator for ArrayMapIter<T, E> {
+    fn next_back(&mut self) -> Option<Self::Item> {
+        self.src.next_back().map(self.mapper)
+    }
+}
+
+impl<T, E> FusedIterator for ArrayMapIter<T, E> {}
+
+impl<T, E> ExactSizeIterator for ArrayMapIter<T, E> {
+    #[inline]
+    fn len(&self) -> usize {
+        self.src.len()
+    }
+}
diff --git a/src/iter/dom_string_list.rs b/src/iter/dom_string_list.rs
new file mode 100644
index 0000000..d16fa82
--- /dev/null
+++ b/src/iter/dom_string_list.rs
@@ -0,0 +1,43 @@
+use std::marker::PhantomData;
+
+use fancy_constructor::new;
+use web_sys::DomStringList;
+
+/// An iterator over a [`DOMStringList`](https://developer.mozilla.org/en-US/docs/Web/API/DOMStringList).
+#[derive(new)]
+#[new(vis(pub(crate)))]
+#[must_use]
+pub struct DomStringIter<'a> {
+    inner: DomStringList,
+
+    #[new(val(0))]
+    idx: u32,
+
+    #[new(val(PhantomData))]
+    _marker: PhantomData<&'a ()>,
+}
+
+impl Iterator for DomStringIter<'_> {
+    type Item = String;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if let Some(v) = self.inner.item(self.idx) {
+            self.idx += 1;
+            Some(v)
+        } else {
+            None
+        }
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let out = self.len();
+        (out, Some(out))
+    }
+}
+
+impl ExactSizeIterator for DomStringIter<'_> {
+    #[inline]
+    fn len(&self) -> usize {
+        (self.inner.length() - self.idx) as usize
+    }
+}
diff --git a/src/iter/get_all.rs b/src/iter/get_all.rs
new file mode 100644
index 0000000..907ee1f
--- /dev/null
+++ b/src/iter/get_all.rs
@@ -0,0 +1,43 @@
+use super::ArrayMapIter;
+use crate::primitive::TryFromJs;
+use wasm_bindgen::prelude::*;
+
+iffeat! {
+    #[cfg(feature = "serde")]
+    use crate::serde::DeserialiseFromJs;
+
+    /// An iterator over [deserialisable](serde::Deserialize) array results.
+    ///
+    /// Created through [`QuerySource::get_all`](crate::query_source::QuerySource::get_all) and
+    /// [`GetAll`](crate::query_source::GetAllRecords).
+    #[cfg(feature = "serde")]
+    pub type GetAllSerdeIter<V> = ArrayMapIter<V>;
+}
+
+/// An iterator over the primitive array results.
+///
+/// Created through [`QuerySource::get_all`](crate::query_source::QuerySource::get_all) and
+/// [`GetAll`](crate::query_source::GetAllRecords).
+pub type GetAllPrimitiveIter<V> = ArrayMapIter<V>;
+
+impl<V> GetAllPrimitiveIter<V> {
+    /// [`new`](ArrayMapIter::new) alias for [`GetAllPrimitiveIter`].
+    pub(crate) fn get_all_primitive(array: js_sys::Array) -> Self
+    where
+        V: TryFromJs,
+    {
+        fn map_primitive<V: TryFromJs>(value: JsValue) -> crate::Result<V> {
+            V::from_js(value).map_err(Into::into)
+        }
+
+        Self::new(array.into_iter(), map_primitive::<V>)
+    }
+
+    #[cfg(feature = "serde")]
+    pub(crate) fn get_all_serde(array: js_sys::Array) -> Self
+    where
+        V: DeserialiseFromJs,
+    {
+        Self::new(array.into_iter(), V::deserialise_from_js)
+    }
+}
diff --git a/src/iter/list_dbs.rs b/src/iter/list_dbs.rs
new file mode 100644
index 0000000..eab068a
--- /dev/null
+++ b/src/iter/list_dbs.rs
@@ -0,0 +1,13 @@
+use crate::factory::DatabaseDetails;
+
+use super::ArrayMapIter;
+
+/// An iterator over the results of future returned by [`DBFactory::databases`](crate::factory::DBFactory::databases).
+pub type ListDatabasesIter = ArrayMapIter<DatabaseDetails>;
+
+impl ListDatabasesIter {
+    /// [`new`](ArrayMapIter::new) alias for [`ListDatabasesIter`].
+    pub(crate) fn list_databases(array: js_sys::Array) -> Self {
+        Self::new(array.into_iter(), TryInto::try_into)
+    }
+}
diff --git a/src/iter/mod.rs b/src/iter/mod.rs
new file mode 100644
index 0000000..0aa266f
--- /dev/null
+++ b/src/iter/mod.rs
@@ -0,0 +1,17 @@
+//! Iterators used by the crate.
+
+pub use dom_string_list::DomStringIter;
+
+pub use array_map::ArrayMapIter;
+
+pub use get_all::*;
+
+mod array_map;
+mod dom_string_list;
+mod get_all;
+
+iffeat! {
+    #[cfg(feature = "list-databases")]
+    mod list_dbs;
+    pub use list_dbs::ListDatabasesIter;
+}
diff --git a/src/key_path.rs b/src/key_path.rs
new file mode 100644
index 0000000..ec2ca97
--- /dev/null
+++ b/src/key_path.rs
@@ -0,0 +1,177 @@
+use crate::internal_utils::slice_to_arr;
+use internal_macros::generic_bounds;
+use smallvec::SmallVec;
+use wasm_bindgen::prelude::*;
+
+/// Alias for the [`SmallVec`](SmallVec)s used for [`Sequence`](KeyPath::Sequence) key paths.
+pub type KeyPathSeq<T = String> = SmallVec<[T; 3]>;
+
+/// A [key path](https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API/Basic_Terminology#gloss_keypath)
+/// representation.
+#[derive(Clone, Debug, PartialEq)]
+pub enum KeyPath<T = String> {
+    /// A key path consisting of a single string.
+    One(T),
+
+    /// A key path consisting of a sequence of strings.
+    Sequence(KeyPathSeq<T>),
+
+    /// A raw key path.
+    JsValue(JsValue),
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> KeyPath<T> {
+    /// Convert the key path to a JsValue.
+    pub fn to_js(&self) -> JsValue {
+        match self {
+            Self::One(v) => JsValue::from_str(v.as_ref()),
+            Self::Sequence(seq) => slice_to_arr(seq).unchecked_into(),
+            Self::JsValue(v) => v.clone(),
+        }
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> From<T> for KeyPath<T> {
+    #[inline]
+    fn from(value: T) -> Self {
+        Self::One(value)
+    }
+}
+
+#[generic_bounds(key_path(K))]
+impl<K> FromIterator<K> for KeyPath<K> {
+    fn from_iter<T: IntoIterator<Item = K>>(iter: T) -> Self {
+        Self::Sequence(iter.into_iter().collect())
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> From<KeyPathSeq<T>> for KeyPath<T> {
+    #[inline]
+    fn from(value: KeyPathSeq<T>) -> Self {
+        Self::Sequence(value)
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> From<Vec<T>> for KeyPath<T> {
+    fn from(value: Vec<T>) -> Self {
+        Self::Sequence(KeyPathSeq::from_vec(value))
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> From<&[T]> for KeyPath<T>
+where
+    T: Clone,
+{
+    fn from(slice: &[T]) -> Self {
+        slice.iter().cloned().collect()
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T, const N: usize> From<[T; N]> for KeyPath<T> {
+    fn from(value: [T; N]) -> Self {
+        value.into_iter().collect()
+    }
+}
+
+impl From<JsValue> for KeyPath {
+    #[inline]
+    fn from(value: JsValue) -> Self {
+        if let Some(str) = value.as_string() {
+            KeyPath::One(str)
+        } else {
+            match value.dyn_into::<js_sys::Array>() {
+                Ok(arr) => {
+                    let iter = arr.into_iter().filter_map(move |v| v.as_string());
+                    iter.collect()
+                }
+                Err(value) => KeyPath::JsValue(value),
+            }
+        }
+    }
+}
+
+#[generic_bounds(key_path(T))]
+impl<T> From<&KeyPath<T>> for JsValue {
+    #[inline]
+    fn from(value: &KeyPath<T>) -> Self {
+        value.to_js()
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use serde::de::{Deserializer, Error as DeError, SeqAccess, Visitor};
+    use serde::ser::{Error as SerError, SerializeSeq, Serializer};
+    use serde::{Deserialize, Serialize};
+    use std::fmt::Formatter;
+
+    #[generic_bounds(key_path(T))]
+    impl<T> Serialize for KeyPath<T> {
+        fn serialize<S>(&self, ser: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            match self {
+                Self::One(v) => ser.serialize_str(v.as_ref()),
+                Self::Sequence(sequence) => {
+                    let mut ser = ser.serialize_seq(Some(sequence.len()))?;
+                    for el in sequence {
+                        ser.serialize_element(el.as_ref())?;
+                    }
+                    ser.end()
+                }
+                Self::JsValue(_) => Err(S::Error::custom("`JSValue`s cannot be serialised")),
+            }
+        }
+    }
+
+    impl<'de> Deserialize<'de> for KeyPath {
+        fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            struct Vis;
+            impl<'de> Visitor<'de> for Vis {
+                type Value = KeyPath;
+
+                fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
+                    formatter.write_str("str or str sequence")
+                }
+
+                fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+                where
+                    E: DeError,
+                {
+                    self.visit_string(v.into())
+                }
+
+                fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+                where
+                    E: DeError,
+                {
+                    Ok(KeyPath::One(v))
+                }
+
+                fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+                where
+                    A: SeqAccess<'de>,
+                {
+                    let mut out = KeyPathSeq::new();
+                    while let Some(next) = seq.next_element()? {
+                        out.push(next);
+                    }
+
+                    Ok(KeyPath::Sequence(out))
+                }
+            }
+
+            deserializer.deserialize_any(Vis)
+        }
+    }
+};
diff --git a/src/key_range.rs b/src/key_range.rs
new file mode 100644
index 0000000..b3c5036
--- /dev/null
+++ b/src/key_range.rs
@@ -0,0 +1,141 @@
+use std::ops::{Range, RangeFrom, RangeInclusive, RangeTo, RangeToInclusive};
+use wasm_bindgen::prelude::*;
+
+use crate::primitive::TryToJs;
+
+/// An [`IDBKeyRange`](https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange) implementation.
+///
+/// This enum gets converted into a [`JsValue`] when communicating with the underlying `IndexedDB` implementation; this
+/// conversion throws an error if one of the following conditions is met:
+///
+/// - The lower or upper parameters were not passed a valid key.
+/// - The lower key is greater than the upper key.
+/// - The lower key and upper key match and either of the bounds are open.
+#[derive(Clone, Eq, PartialEq, Hash, Ord, PartialOrd, Debug)]
+pub enum KeyRange<T> {
+    /// `(lower_bound_key, lower_bound_open)`
+    LowerBound(T, bool),
+
+    /// `(upper_bound_key, upper_bound_open)`
+    UpperBound(T, bool),
+
+    /// `(lower_bound_key, lower_bound_open, upper_bound_key, upper_bound_open)`
+    Bound(T, bool, T, bool),
+
+    /// Note: This defaults to passing the value on directly instead of calling
+    /// [`IDBKeyRange.only`](https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/only).
+    /// In order to use an explicit `only` key range, use the
+    /// [`explicitly_only`](KeyRange::<JsValue>::explicitly_only) method.
+    Only(T),
+}
+
+impl KeyRange<JsValue> {
+    /// Construct a [`KeyRange`] with an explicit
+    /// [`IDBKeyRange.only`](https://developer.mozilla.org/en-US/docs/Web/API/IDBKeyRange/only) call.
+    ///
+    /// See also [`KeyRange::Only`](KeyRange::Only) for more info.
+    #[allow(clippy::missing_errors_doc)]
+    pub fn explicitly_only<T: TryToJs>(value: T) -> crate::Result<Self> {
+        value.try_to_js().map(Self::Only)
+    }
+}
+
+impl<T> KeyRange<T> {
+    fn try_to_js_any<F>(&self, key_fn: F) -> crate::Result<JsValue>
+    where
+        F: Fn(&T) -> crate::Result<JsValue>,
+    {
+        let res = match *self {
+            Self::Only(ref key) => return key_fn(key),
+            Self::LowerBound(ref key, open) => {
+                web_sys::IdbKeyRange::lower_bound_with_open(&key_fn(key)?, open)
+            }
+            Self::UpperBound(ref key, open) => {
+                web_sys::IdbKeyRange::upper_bound_with_open(&key_fn(key)?, open)
+            }
+            Self::Bound(ref lower, lower_open, ref upper, upper_open) => {
+                web_sys::IdbKeyRange::bound_with_lower_open_and_upper_open(
+                    &key_fn(lower)?,
+                    &key_fn(upper)?,
+                    lower_open,
+                    upper_open,
+                )
+            }
+        };
+
+        match res {
+            Ok(v) => Ok(v.unchecked_into()),
+            Err(e) => Err(e.into()),
+        }
+    }
+}
+
+impl<T> From<Range<T>> for KeyRange<T> {
+    #[inline]
+    fn from(value: Range<T>) -> Self {
+        Self::Bound(value.start, false, value.end, true)
+    }
+}
+
+impl<T> From<RangeFrom<T>> for KeyRange<T> {
+    #[inline]
+    fn from(value: RangeFrom<T>) -> Self {
+        Self::LowerBound(value.start, false)
+    }
+}
+
+impl<T> From<RangeInclusive<T>> for KeyRange<T> {
+    fn from(value: RangeInclusive<T>) -> Self {
+        let (start, end) = value.into_inner();
+
+        Self::Bound(start, false, end, false)
+    }
+}
+
+impl<T> From<RangeTo<T>> for KeyRange<T> {
+    #[inline]
+    fn from(value: RangeTo<T>) -> Self {
+        Self::UpperBound(value.end, false)
+    }
+}
+
+impl<T> From<RangeToInclusive<T>> for KeyRange<T> {
+    #[inline]
+    fn from(value: RangeToInclusive<T>) -> Self {
+        Self::UpperBound(value.end, true)
+    }
+}
+
+impl<T: TryToJs> From<T> for KeyRange<T> {
+    #[inline]
+    fn from(value: T) -> Self {
+        Self::Only(value)
+    }
+}
+
+impl<T: TryToJs> TryToJs for KeyRange<T> {
+    #[inline]
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        self.try_to_js_any(TryToJs::try_to_js)
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::serde::SerialiseToJs;
+    use serde::Serialize;
+
+    impl<T: Serialize> SerialiseToJs for KeyRange<T> {
+        #[inline]
+        fn serialise_to_js(&self) -> crate::Result<JsValue> {
+            self.try_to_js_any(SerialiseToJs::serialise_to_js)
+        }
+    }
+
+    impl<T: Serialize> SerialiseToJs for &KeyRange<T> {
+        #[inline]
+        fn serialise_to_js(&self) -> crate::Result<JsValue> {
+            <KeyRange<T>>::serialise_to_js(self)
+        }
+    }
+};
diff --git a/src/lib.rs b/src/lib.rs
index dc5ad5d..c033d40 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,336 +1,109 @@
-//! Wraps the [web_sys](https://crates.io/crates/web_sys) Indexed DB API in a Future-based API and
-//! removes the pain of dealing with Javascript callbacks in Rust.
+//! Wraps the [web_sys](https://docs.rs/web_sys) Indexed DB API in a Future-based API and
+//! removes the pain of dealing with JS callbacks or `JSValue` in Rust.
 //!
 //! [![master CI badge](https://github.com/Alorel/rust-indexed-db/actions/workflows/test.yml/badge.svg)](https://github.com/Alorel/rust-indexed-db/actions/workflows/test.yml)
 //! [![crates.io badge](https://img.shields.io/crates/v/indexed_db_futures)](https://crates.io/crates/indexed_db_futures)
 //! [![docs.rs badge](https://img.shields.io/docsrs/indexed_db_futures?label=docs.rs)](https://docs.rs/indexed_db_futures)
 //! [![dependencies badge](https://img.shields.io/librariesio/release/cargo/indexed_db_futures)](https://libraries.io/cargo/indexed_db_futures)
 //!
-//! ## Overall API design
-//!
-//! In most cases API methods will return a [`Result`](::std::result::Result) containing a wrapped
-//! [`IdbRequest`](crate::web_sys::IdbRequest) that implements [`IntoFuture`](::std::future::IntoFuture), such as
-//! [`VoidRequest`](crate::request::VoidRequest), or, when more appropriate, the [`Future`](::std::future::Future)
-//! directly, e.g. [`CountFuture`](crate::request::CountFuture).
-//!
-//! The key difference between a wrapped Request and Future is that Requests don't have _any_ event
-//! listeners attached, which aims to make quickfire operations such as inserting several records
-//! into an [`IdbObjectStore`](crate::idb_object_store::IdbObjectStore) a little bit more efficient.
-//!
-//! ## Features
-//!
-//! The library can ship without cursor or index support for apps that just need a simple key-value
-//! store akin to `localStorage`.
-//!
-//! - `cursors` - Enable cursor support
-//! - `indices` - Enable index support
-//! - `nightly` - Use unsafe nightly features where appropriate, such as [`unwrap_unchecked`](Option::unwrap_unchecked).
-//! - `default`:
-//!    - `cursors`
-//!    - `indices`
-//!
-//! ## Examples
-//!
-//! ### Connecting to a DB and doing basic CRUD
-//!
-//! Variable types included for clarity.
-//!
-//! ```rust
-//! use indexed_db_futures::prelude::*;
-//!# use web_sys::DomException;
-//!# use wasm_bindgen::prelude::*;
-//!#
-//!# fn use_value(_v: Option<JsValue>) {}
-//!# fn get_some_js_value() -> JsValue { JsValue::UNDEFINED }
-//!
-//! pub async fn example() -> Result<(), DomException> {
-//!     // Open my_db v1
-//!     let mut db_req: OpenDbRequest = IdbDatabase::open_u32("my_db", 1)?;
-//!     db_req.set_on_upgrade_needed(Some(|evt: &IdbVersionChangeEvent| -> Result<(), JsValue> {
-//!         // Check if the object store exists; create it if it doesn't
-//!         if let None = evt.db().object_store_names().find(|n| n == "my_store") {
-//!             evt.db().create_object_store("my_store")?;
-//!         }
-//!         Ok(())
-//!     }));
-//!
-//!     let db: IdbDatabase = db_req.await?;
-//!
-//!     // Insert/overwrite a record
-//!     let tx: IdbTransaction = db
-//!       .transaction_on_one_with_mode("my_store", IdbTransactionMode::Readwrite)?;
-//!     let store: IdbObjectStore = tx.object_store("my_store")?;
-//!
-//!     let value_to_put: JsValue = get_some_js_value();
-//!     store.put_key_val_owned("my_key", &value_to_put)?;
-//!
-//!     // IDBTransactions can have an Error or an Abort event; into_result() turns both into a
-//!     // DOMException
-//!     tx.await.into_result()?;
-//!
-//!     // Delete a record
-//!     let tx = db.transaction_on_one_with_mode("my_store", IdbTransactionMode::Readwrite)?;
-//!     let store = tx.object_store("my_store")?;
-//!     store.delete_owned("my_key")?;
-//!     tx.await.into_result()?;
-//!
-//!     // Get a record
-//!     let tx = db.transaction_on_one("my_store")?;
-//!     let store = tx.object_store("my_store")?;
-//!
-//!     let value: Option<JsValue> = store.get_owned("my_key")?.await?;
-//!     use_value(value);
-//!
-//!     Ok(())
-//! }
-//! ```
 
 #![deny(clippy::correctness, clippy::suspicious)]
-#![warn(clippy::complexity, clippy::perf, clippy::style, clippy::pedantic)]
-#![warn(missing_docs)]
-#![allow(
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::uninlined_format_args
+#![warn(
+    clippy::complexity,
+    clippy::perf,
+    clippy::style,
+    clippy::pedantic,
+    missing_docs
 )]
-#![allow(rustdoc::redundant_explicit_links)]
+#![allow(clippy::module_name_repetitions, clippy::wildcard_imports)]
 #![cfg_attr(doc_cfg, feature(doc_auto_cfg))]
 
-pub use js_sys;
-pub use web_sys;
-
-pub use idb_database::*;
-pub use idb_key_path::*;
-pub use idb_query_source::*;
-
-#[cfg(test)]
-wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-
-#[cfg(test)]
-macro_rules! test_mod_init {
-    () => {
-        #[allow(unused_imports)]
-        use {
-            super::*,
-            wasm_bindgen::{prelude::*, JsCast},
-            wasm_bindgen_test::*,
-        };
+pub use build::*;
+pub use key_path::{KeyPath, KeyPathSeq};
+pub use key_range::KeyRange;
+
+/// `cfg_if` doesn't add appropriate tags in docs.rs
+macro_rules! iffeat {
+    (#[cfg(feature = $feat: literal)] $($stmt: item)+) => {
+        $(
+            #[cfg(feature = $feat)]
+            $stmt
+        )+
     };
 }
 
-#[cfg(test)]
-macro_rules! test_case {
-    ($name: ident => $body: block) => {
-        #[wasm_bindgen_test::wasm_bindgen_test]
-        fn $name() {
-            $body
-        }
+macro_rules! fwd_cast_js {
+    (TryFromJs: $($ty: ty),+ $(,)?) => {
+        $(
+            impl $crate::primitive::TryFromJs for $ty {
+                fn from_js(js: ::wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                    ::wasm_bindgen::JsCast::dyn_into(js).map_err($crate::error::SimpleValueError::DynCast)
+                }
+            }
+        )+
+    };
+    (TryToJs: $($ty: ty),+ $(,)?) => {
+        $(
+            #[allow(unused_qualifications)]
+            impl $crate::primitive::try_to_js::TryToJs for $ty {
+                fn try_to_js(&self) -> $crate::Result<::wasm_bindgen::JsValue> {
+                    Ok(::wasm_bindgen::JsCast::unchecked_ref::<::wasm_bindgen::JsValue>(self).clone())
+                }
+            }
+        )+
     };
-    (async $name: ident => $body: block) => {
-        #[wasm_bindgen_test::wasm_bindgen_test]
-        async fn $name() {
-            $body
-        }
+    ($($ty: ty),+ $(,)?) => {
+        fwd_cast_js!(TryFromJs: $($ty),+);
+        fwd_cast_js!(TryToJs: $($ty),+);
     };
 }
 
-macro_rules! impl_display_for_named {
-    ($for: ty) => {
-        impl std::fmt::Display for $for {
-            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                #[allow(unused_imports)]
-                use $crate::idb_query_source::IdbQuerySource;
-                f.write_str(&self.name())
-            }
-        }
+#[allow(unused_macros)]
+macro_rules! log {
+    ($level: ident, $($arg:tt)+) => {
+        #[cfg(feature = "__unit-tests")]
+        ::log::log!(::log::Level::$level, $($arg)+);
     };
 }
 
-macro_rules! impl_query_source {
-    ($for: ty) => {
-        impl_display_for_named!($for);
-
-        impl $crate::idb_query_source::IdbQuerySource for $for {
-            // Cursors
-            cfg_if::cfg_if! {
-                if #[cfg(feature = "cursors")] {
-                    fn open_cursor(
-                        &self,
-                    ) -> Result<$crate::request::IdbCursorWithValueFuture<Self>, web_sys::DomException>
-                    {
-                        let base = $crate::request::IdbCursorFuture::new(self.inner.open_cursor(), self)?;
-                        Ok($crate::request::IdbCursorWithValueFuture::new(base))
-                    }
-
-                    fn open_cursor_with_range_and_direction<K: wasm_bindgen::JsCast>(&self, range: &K, direction: web_sys::IdbCursorDirection) -> Result<$crate::request::IdbCursorWithValueFuture<Self>, web_sys::DomException> {
-                        #[allow(unused_imports)]
-                        use wasm_bindgen::JsCast;
-                        let base = self.inner.open_cursor_with_range_and_direction(range.unchecked_ref(), direction);
-                        let base = $crate::request::IdbCursorFuture::new(base, self)?;
-                        Ok($crate::request::IdbCursorWithValueFuture::new(base))
-                    }
+pub mod database;
+pub mod error;
+pub mod future;
+pub mod iter;
 
-                    fn open_cursor_with_range<K: wasm_bindgen::JsCast>(&self, range: &K) -> Result<$crate::request::IdbCursorWithValueFuture<Self>, web_sys::DomException> {
-                        #[allow(unused_imports)]
-                        use wasm_bindgen::JsCast;
-                        let base = self.inner.open_cursor_with_range(range.unchecked_ref());
-                        let base = $crate::request::IdbCursorFuture::new(base, self)?;
-                        Ok($crate::request::IdbCursorWithValueFuture::new(base))
-                    }
+pub mod query_source;
 
-                    fn open_key_cursor(
-                        &self,
-                    ) -> Result<$crate::request::IdbCursorFuture<Self>, web_sys::DomException> {
-                        $crate::request::IdbCursorFuture::new(self.inner.open_key_cursor(), self)
-                    }
+/// A [`Result`](std::result::Result) with an [`Error`](error::Error) as the error type.
+pub type Result<T> = std::result::Result<T, error::Error>;
 
-                    fn open_key_cursor_with_range<K: wasm_bindgen::JsCast>(&self, range: &K) -> Result<$crate::request::IdbCursorFuture<Self>, web_sys::DomException> {
-                        let base = self.inner.open_key_cursor_with_range(range.unchecked_ref());
-                        $crate::request::IdbCursorFuture::new(base, self)
-                    }
+/// A [`Result`](std::result::Result) with an [`OpenDbError`](error::OpenDbError) as the error type.
+pub type OpenDbResult<T> = std::result::Result<T, error::OpenDbError>;
 
-                    fn open_key_cursor_with_range_and_direction<K: wasm_bindgen::JsCast>(&self, range: &K, direction: web_sys::IdbCursorDirection) -> Result<$crate::request::IdbCursorFuture<Self>, web_sys::DomException> {
-                        let base = self.inner.open_key_cursor_with_range_and_direction(range.unchecked_ref(), direction);
-                        $crate::request::IdbCursorFuture::new(base, self)
-                    }
-                }
-            }
-
-            #[inline]
-            fn get<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-            ) -> Result<$crate::request::OptionalJsValueFuture, web_sys::DomException> {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::OptionalJsValueFuture::new(self.inner.get(key.unchecked_ref()))
-            }
-
-            #[inline]
-            fn get_all(
-                &self,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                $crate::request::JsCastRequestFuture::new(self.inner.get_all())
-            }
-
-            #[inline]
-            fn get_all_with_key<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::JsCastRequestFuture::new(self.inner.get_all_with_key(key.unchecked_ref()))
-            }
-
-            #[inline]
-            fn get_all_with_key_and_limit<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-                limit: u32,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                let base = self.inner.get_all_with_key_and_limit(key.unchecked_ref(), limit);
-                $crate::request::JsCastRequestFuture::new(base)
-            }
-
-            #[inline]
-            fn count(&self) -> Result<$crate::request::CountFuture, web_sys::DomException> {
-                $crate::request::CountFuture::new(self.inner.count())
-            }
-
-            #[inline]
-            fn key_path(&self) -> Option<$crate::idb_key_path::IdbKeyPath> {
-                $crate::idb_key_path::IdbKeyPath::try_from_js(self.inner.key_path())
-            }
-
-            #[inline]
-            fn count_with_key<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-            ) -> Result<$crate::request::CountFuture, web_sys::DomException> {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::CountFuture::new(self.inner.count_with_key(key.unchecked_ref()))
-            }
-
-            #[inline]
-            fn name(&self) -> String {
-                self.inner.name()
-            }
-
-            #[inline]
-            fn set_name(&self, name: &str) {
-                self.inner.set_name(name);
-            }
-
-            #[inline]
-            fn get_key<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-            ) -> Result<$crate::request::OptionalJsValueFuture, web_sys::DomException> {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::OptionalJsValueFuture::new(self.inner.get_key(key.unchecked_ref()))
-            }
-
-            #[inline]
-            fn get_all_keys(
-                &self,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                $crate::request::JsCastRequestFuture::new(self.inner.get_all_keys())
-            }
-
-            #[inline]
-            fn get_all_keys_with_key<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::JsCastRequestFuture::new(self.inner.get_all_keys_with_key(key.unchecked_ref()))
-            }
-
-            #[inline]
-            fn get_all_keys_with_key_and_limit<K: wasm_bindgen::JsCast>(
-                &self,
-                key: &K,
-                limit: u32,
-            ) -> Result<$crate::request::JsCastRequestFuture<js_sys::Array>, web_sys::DomException>
-            {
-                #[allow(unused_imports)]
-                use wasm_bindgen::JsCast;
-                $crate::request::JsCastRequestFuture::new(
-                    self.inner.get_all_keys_with_key_and_limit(key.unchecked_ref(), limit),
-                )
-            }
-        }
-    };
-}
-
-mod idb_database;
-pub mod idb_object_store;
-mod idb_query_source;
-pub mod idb_transaction;
 mod internal_utils;
+mod key_path;
+mod key_range;
+pub mod object_store;
 pub mod prelude;
-pub mod request;
+pub mod primitive;
+pub mod transaction;
 
-pub(crate) mod dom_string_iterator;
+#[cfg(feature = "dates")]
+pub mod date;
+pub mod factory;
 
-#[cfg(feature = "indices")]
-mod idb_index;
+mod build;
+#[cfg(feature = "typed-arrays")]
+pub mod typed_array;
 
+#[cfg(feature = "cursors")]
+pub mod cursor;
 #[cfg(feature = "indices")]
-pub use idb_index::*;
+pub mod index;
 
-#[cfg(feature = "cursors")]
-pub mod idb_cursor;
-mod idb_key_path;
+pub mod internals;
+
+iffeat! {
+    #[cfg(feature = "serde")]
+    mod serde;
+    pub use serde::{DeserialiseFromJs, SerialiseToJs};
+}
diff --git a/src/object_store.rs b/src/object_store.rs
new file mode 100644
index 0000000..910fee0
--- /dev/null
+++ b/src/object_store.rs
@@ -0,0 +1,162 @@
+//! An [`IDBObjectStore`](https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore) implementation.
+
+use accessory::Accessors;
+use fancy_constructor::new;
+
+use internal_macros::errdoc;
+
+use crate::database::Database;
+use crate::future::{Request, VoidRequest};
+use crate::internal_utils::SystemRepr;
+use crate::query_source::QuerySource;
+use crate::transaction::Transaction;
+use crate::KeyRange;
+pub use add_put::{Add, AddPut, Put};
+pub use delete::Delete;
+
+pub(crate) mod add_put;
+
+mod delete;
+
+/// An [`IDBObjectStore`](https://developer.mozilla.org/en-US/docs/Web/API/IDBObjectStore) implementation.
+#[derive(Accessors, new, Debug, Clone)]
+#[new(vis())]
+pub struct ObjectStore<'a> {
+    inner: web_sys::IdbObjectStore,
+
+    /// Reference to the database associated with the store
+    #[access(get(cp))]
+    db: &'a Database,
+
+    /// Reference to the transaction associated with the store
+    #[access(get(cp))]
+    transaction: Option<&'a Transaction<'a>>,
+}
+
+impl ObjectStore<'_> {
+    /// Add the value to the object store. Throws if the computed key already exists - use the
+    /// [`put`](Self::put) method if you want to update the value.
+    ///
+    /// The value should implement either [`TryToJs`](crate::primitive::TryToJs) or, if the `serde` feature is enabled,
+    /// [`Serialize`](serde::Serialize).
+    ///
+    /// # Returns
+    ///
+    /// A builder that, when built and `await`ed, resolves to the key for the added record, or `()` if the key type
+    /// cannot be determined ([`with_key`](Add::with_key)/[`with_key_type`](Add::with_key_type) not called or
+    /// [`without_key_type`](Add::without_key_type) called).
+    #[errdoc(ObjectStore(
+        ReadOnlyError,
+        TransactionInactiveError,
+        DataErrorAdd,
+        InvalidStateError,
+        DataCloneError,
+        ConstraintError,
+    ))]
+    #[inline]
+    pub fn add<V>(&self, value: V) -> Add<V> {
+        Add::new(self, value)
+    }
+
+    /// Add the value to the object store. Overwrites the record if the computed key already exists - use the
+    /// [`add`](Self::add) method if you want to throw an error instead.
+    ///
+    /// The value should implement either [`TryToJs`](crate::primitive::TryToJs) or, if the `serde` feature is enabled,
+    /// [`Serialize`](serde::Serialize).
+    ///
+    /// # Returns
+    ///
+    /// A builder that, when built and `await`ed, resolves to the key for the added record, or `()` if the key type
+    /// cannot be determined ([`with_key`](Put::with_key)/[`with_key_type`](Put::with_key_type) not called or
+    /// [`without_key_type`](Put::without_key_type) called).
+    #[errdoc(ObjectStore(
+        ReadOnlyError,
+        TransactionInactiveError,
+        DataErrorAdd,
+        InvalidStateError,
+        DataCloneError,
+        ConstraintError,
+    ))]
+    #[inline]
+    pub fn put<V>(&self, value: V) -> Put<V> {
+        Put::new(self, value)
+    }
+
+    /// Return the value of the auto increment flag for this object store.
+    ///
+    /// Note that every object store has its own separate auto increment counter.
+    #[inline]
+    #[must_use]
+    pub fn auto_increment(&self) -> bool {
+        self.as_sys().auto_increment()
+    }
+
+    /// Clear all records from this object store.
+    #[errdoc(ObjectStore(ReadOnlyError, TransactionInactiveError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn clear(&self) -> crate::Result<VoidRequest> {
+        let req = self.as_sys().clear()?;
+
+        Ok(Request::new(req))
+    }
+
+    /// Delete the record(s) matching the given key or key range.
+    ///
+    /// The range should implement either [`TryToJs`](crate::primitive::TryToJs) or, if the `serde` feature is enabled,
+    /// [`Serialize`](serde::Serialize).
+    ///
+    /// Bear in mind that if you are using a [`Cursor`](crate::cursor::Cursor)
+    /// (requires `cursors` feature), you can use the
+    /// [`Cursor::delete`](crate::cursor::Cursor::delete) method to more efficiently delete the
+    /// current record — without having to explicitly look up the record's key.
+    #[errdoc(ObjectStore(
+        ReadOnlyError,
+        TransactionInactiveError,
+        InvalidStateError,
+        DataErrorDelete,
+    ))]
+    pub fn delete<K, I>(&self, key_range: I) -> Delete<K>
+    where
+        I: Into<KeyRange<K>>,
+    {
+        Delete::new(self, key_range.into())
+    }
+
+    /// Delete this object store.
+    #[errdoc(Database(
+        InvalidStateErrorObjectStore,
+        TransactionInactiveError,
+        NotFoundErrorDeleteObjectStore
+    ))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn delete_object_store(self) -> crate::Result<()> {
+        self.db.delete_object_store(&self.name())
+    }
+}
+
+impl<'a> ObjectStore<'a> {
+    #[inline]
+    pub(crate) fn from_version_change(inner: web_sys::IdbObjectStore, db: &'a Database) -> Self {
+        Self::new(inner, db, None)
+    }
+
+    pub(crate) fn from_tx(inner: web_sys::IdbObjectStore, tx: &'a Transaction<'a>) -> Self {
+        Self::new(inner, tx.db(), Some(tx))
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for ObjectStore<'_> {
+    type Repr = web_sys::IdbObjectStore;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        &self.inner
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.inner
+    }
+}
diff --git a/src/object_store/add_put.rs b/src/object_store/add_put.rs
new file mode 100644
index 0000000..11175ce
--- /dev/null
+++ b/src/object_store/add_put.rs
@@ -0,0 +1,340 @@
+use super::ObjectStore;
+use crate::future::{BasicRequest, VoidRequest};
+use crate::internal_utils::Void;
+use crate::primitive::{TryFromJs, TryToJs};
+use derive_more::Debug;
+use internal_macros::BuildIntoFut;
+use kind::InsertKind;
+use sealed::sealed;
+use std::marker::PhantomData;
+
+/// Builder for [`ObjectStore::add`]
+pub type Add<'a, T, K = Void, KT = Void> = AddPut<'a, kind::Add, T, K, KT>;
+
+/// Builder for [`ObjectStore::put`].
+pub type Put<'a, T, K = Void, KT = Void> = AddPut<'a, kind::Put, T, K, KT>;
+
+/// Builder for [`ObjectStore::add`] & [`ObjectStore::put`].
+#[derive(Debug, BuildIntoFut)]
+#[must_use]
+pub struct AddPut<'a, AP, T, K = Void, KT = Void> {
+    #[debug(skip)]
+    object_store: &'a ObjectStore<'a>,
+    value: T,
+    key: K,
+
+    #[debug(skip)]
+    marker: PhantomData<(AP, KT)>,
+}
+
+impl<'a, AP: InsertKind, T> AddPut<'a, AP, T> {
+    #[inline]
+    pub(super) fn new(object_store: &'a ObjectStore<'a>, value: T) -> Self {
+        Self {
+            object_store,
+            value,
+            key: Void::VOID,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, AP, T, K, KT> AddPut<'a, AP, T, K, KT> {
+    /// Set the key to use to identify the record.
+    #[inline]
+    pub fn with_key<K2>(self, key: K2) -> AddPut<'a, AP, T, K2, K2> {
+        AddPut {
+            object_store: self.object_store,
+            value: self.value,
+            key,
+            marker: PhantomData,
+        }
+    }
+
+    /// Set the type of the key to be returned if different from that set by [`with_key`](Self::with_key), or
+    /// if that method is inapplicable for this operation.
+    #[inline]
+    pub fn with_key_type<KT2>(self) -> AddPut<'a, AP, T, K, KT2> {
+        AddPut {
+            object_store: self.object_store,
+            value: self.value,
+            key: self.key,
+            marker: PhantomData,
+        }
+    }
+
+    /// Unset the key type set by [`with_key`](Self::with_key) or [`with_key_type`](Self::with_key_type).
+    #[inline]
+    pub fn without_key_type(self) -> AddPut<'a, AP, T, K, Void> {
+        AddPut {
+            object_store: self.object_store,
+            value: self.value,
+            key: self.key,
+            marker: PhantomData,
+        }
+    }
+
+    fn jsify_key_value(&self) -> crate::Result<[::wasm_bindgen::JsValue; 2]>
+    where
+        T: TryToJs,
+        K: TryToJs,
+    {
+        let key = self.key.try_to_js()?;
+        let value = self.value.try_to_js()?;
+        Ok([key, value])
+    }
+}
+
+#[sealed]
+impl<AP, T> crate::BuildPrimitive for AddPut<'_, AP, T>
+where
+    AP: InsertKind,
+    T: TryToJs,
+{
+    type Fut = VoidRequest;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let Self {
+            object_store,
+            value,
+            key: _,
+            marker: _,
+        } = self;
+
+        let value = value.try_to_js()?;
+        let req = AP::add(object_store, value)?;
+
+        Ok(VoidRequest::new(req))
+    }
+}
+
+#[sealed]
+impl<AP, T, KT> crate::BuildPrimitive for AddPut<'_, AP, T, Void, KT>
+where
+    AP: InsertKind,
+    T: TryToJs,
+    KT: TryFromJs,
+{
+    type Fut = BasicRequest<KT>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let Self {
+            object_store,
+            value,
+            key: _,
+            marker: _,
+        } = self;
+
+        let value = value.try_to_js()?;
+        let req = AP::add(object_store, value)?;
+
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[sealed]
+impl<AP, T, K> crate::BuildPrimitive for AddPut<'_, AP, T, K>
+where
+    AP: InsertKind,
+    T: TryToJs,
+    K: TryToJs,
+{
+    type Fut = VoidRequest;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let [key, value] = self.jsify_key_value()?;
+        let req = AP::add_with_key(self.object_store, key, value)?;
+
+        Ok(VoidRequest::new(req))
+    }
+}
+
+#[sealed]
+impl<AP, T, K, KT> crate::BuildPrimitive for AddPut<'_, AP, T, K, KT>
+where
+    AP: InsertKind,
+    T: TryToJs,
+    K: TryToJs,
+    KT: TryFromJs,
+{
+    type Fut = BasicRequest<KT>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let [key, value] = self.jsify_key_value()?;
+        let req = AP::add_with_key(self.object_store, key, value)?;
+
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+/// Special handling for `&str` - UX for devs.
+#[sealed]
+impl<AP, T> crate::BuildPrimitive for AddPut<'_, AP, T, &str, &str>
+where
+    AP: InsertKind,
+    T: TryToJs,
+{
+    type Fut = BasicRequest<String>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        self.with_key_type::<String>().primitive()
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::serde::{DeserialiseFromJs, SerialiseToJs};
+
+    impl<AP, T, K, KT> AddPut<'_, AP, T, K, KT>
+    where
+        T: SerialiseToJs,
+        K: SerialiseToJs,
+    {
+        fn serialise_key_value(&self) -> crate::Result<[::wasm_bindgen::JsValue; 2]> {
+            Ok([self.key.serialise_to_js()?, self.value.serialise_to_js()?])
+        }
+    }
+
+    #[sealed]
+    impl<AP, T> crate::BuildSerde for AddPut<'_, AP, T>
+    where
+        AP: InsertKind,
+        T: SerialiseToJs,
+    {
+        type Fut = VoidRequest;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let Self {
+                object_store,
+                value,
+                key: _,
+                marker: _,
+            } = self;
+
+            let value = value.serialise_to_js()?;
+            let req = AP::add(object_store, value)?;
+
+            Ok(VoidRequest::new(req))
+        }
+    }
+
+    #[sealed]
+    impl<AP, T, KT> crate::BuildSerde for AddPut<'_, AP, T, Void, KT>
+    where
+        AP: InsertKind,
+        T: SerialiseToJs,
+        KT: DeserialiseFromJs,
+    {
+        type Fut = BasicRequest<KT>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let Self {
+                object_store,
+                value,
+                key: _,
+                marker: _,
+            } = self;
+
+            let value = value.serialise_to_js()?;
+            let req = AP::add(object_store, value)?;
+
+            Ok(BasicRequest::new_ser(req))
+        }
+    }
+
+    #[sealed]
+    impl<AP, T, K> crate::BuildSerde for AddPut<'_, AP, T, K>
+    where
+        AP: InsertKind,
+        T: SerialiseToJs,
+        K: SerialiseToJs,
+    {
+        type Fut = VoidRequest;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let [key, value] = self.serialise_key_value()?;
+            let req = AP::add_with_key(self.object_store, key, value)?;
+
+            Ok(VoidRequest::new(req))
+        }
+    }
+
+    #[sealed]
+    impl<AP, T, K, KT> crate::BuildSerde for AddPut<'_, AP, T, K, KT>
+    where
+        AP: InsertKind,
+        T: SerialiseToJs,
+        K: SerialiseToJs,
+        KT: DeserialiseFromJs,
+    {
+        type Fut = BasicRequest<KT>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let [key, value] = self.serialise_key_value()?;
+            let req = AP::add_with_key(self.object_store, key, value)?;
+
+            Ok(BasicRequest::new_ser(req))
+        }
+    }
+};
+
+pub(crate) mod kind {
+    use super::super::ObjectStore;
+    use crate::internal_utils::SystemRepr;
+    use sealed::sealed;
+    use wasm_bindgen::prelude::*;
+
+    #[allow(missing_docs)]
+    pub struct Add();
+
+    #[allow(missing_docs)]
+    pub struct Put();
+
+    /// The type of record insertion operation.
+    #[sealed]
+    pub trait InsertKind {
+        #[doc(hidden)]
+        fn add(store: &ObjectStore<'_>, value: JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn add_with_key(
+            store: &ObjectStore<'_>,
+            key: JsValue,
+            value: JsValue,
+        ) -> Result<web_sys::IdbRequest, JsValue>;
+    }
+
+    #[sealed]
+    impl InsertKind for Add {
+        #[inline]
+        fn add(store: &ObjectStore<'_>, value: JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+            store.as_sys().add(&value)
+        }
+
+        #[inline]
+        fn add_with_key(
+            store: &ObjectStore<'_>,
+            key: JsValue,
+            value: JsValue,
+        ) -> Result<web_sys::IdbRequest, JsValue> {
+            store.as_sys().add_with_key(&value, &key)
+        }
+    }
+
+    #[sealed]
+    impl InsertKind for Put {
+        #[inline]
+        fn add(store: &ObjectStore<'_>, value: JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+            store.as_sys().put(&value)
+        }
+
+        #[inline]
+        fn add_with_key(
+            store: &ObjectStore<'_>,
+            key: JsValue,
+            value: JsValue,
+        ) -> Result<web_sys::IdbRequest, JsValue> {
+            store.as_sys().put_with_key(&value, &key)
+        }
+    }
+}
diff --git a/src/object_store/delete.rs b/src/object_store/delete.rs
new file mode 100644
index 0000000..8e571e8
--- /dev/null
+++ b/src/object_store/delete.rs
@@ -0,0 +1,52 @@
+use super::ObjectStore;
+use crate::future::VoidRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::TryToJs;
+use crate::KeyRange;
+use fancy_constructor::new;
+use internal_macros::BuildIntoFut;
+use sealed::sealed;
+use wasm_bindgen::prelude::*;
+
+/// Builder for [`ObjectStore::delete`].
+#[derive(BuildIntoFut, new)]
+#[new(vis(pub(super)))]
+#[must_use]
+pub struct Delete<'a, K> {
+    store: &'a ObjectStore<'a>,
+    key: KeyRange<K>,
+}
+
+impl<K> Delete<'_, K> {
+    fn into_req(self, key: &JsValue) -> crate::Result<VoidRequest> {
+        let req = self.store.as_sys().delete(key)?;
+        Ok(VoidRequest::new(req))
+    }
+}
+
+#[sealed]
+impl<K> crate::BuildPrimitive for Delete<'_, K>
+where
+    KeyRange<K>: TryToJs,
+{
+    type Fut = VoidRequest;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let key = self.key.try_to_js()?;
+        self.into_req(&key)
+    }
+}
+
+#[cfg(feature = "serde")]
+#[sealed]
+impl<K> crate::BuildSerde for Delete<'_, K>
+where
+    KeyRange<K>: crate::serde::SerialiseToJs,
+{
+    type Fut = VoidRequest;
+
+    fn serde(self) -> crate::Result<Self::Fut> {
+        let key = crate::serde::SerialiseToJs::serialise_to_js(&self.key)?;
+        self.into_req(&key)
+    }
+}
diff --git a/src/prelude.rs b/src/prelude.rs
index e6be1ba..90266dd 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -1,17 +1,5 @@
-//! The file to `use` everything from in most cases
+//! Things to `use::*`.
 
-#[cfg(feature = "cursors")]
-pub use {crate::idb_cursor::*, web_sys::IdbCursorDirection};
-#[cfg(feature = "indices")]
-pub use {crate::idb_index::*, web_sys::IdbIndexParameters};
-pub use {
-    crate::{
-        idb_database::*,
-        idb_key_path::*,
-        idb_object_store::{IdbObjectStore, IdbObjectStoreParameters},
-        idb_query_source::IdbQuerySource,
-        idb_transaction::{IdbTransaction, IdbTransactionResult},
-        request::*,
-    },
-    web_sys::IdbTransactionMode,
-};
+pub use crate::build::*;
+pub use crate::future::PollUnpinned;
+pub use crate::query_source::QuerySource;
diff --git a/src/primitive.rs b/src/primitive.rs
new file mode 100644
index 0000000..3c8b7d5
--- /dev/null
+++ b/src/primitive.rs
@@ -0,0 +1,25 @@
+//! Types for working with `wasm-bindgen` and `js-sys` primitive that
+//! don't require [`serde`] for converting between Rust & JS.
+
+mod from_js;
+
+mod try_to_js;
+
+pub use {from_js::*, try_to_js::*};
+
+iffeat! {
+    #[cfg(feature = "switch")]
+    mod switch;
+    pub use switch::*;
+}
+
+fwd_cast_js!(
+    web_sys::DomException,
+    js_sys::Error,
+    js_sys::Date,
+    js_sys::JsString,
+    js_sys::Number,
+    js_sys::ArrayBuffer,
+    js_sys::Array,
+    js_sys::Object,
+);
diff --git a/src/primitive/from_js.rs b/src/primitive/from_js.rs
new file mode 100644
index 0000000..ed89011
--- /dev/null
+++ b/src/primitive/from_js.rs
@@ -0,0 +1,298 @@
+use crate::error::SimpleValueError;
+use crate::iter::ArrayMapIter;
+use cfg_if::cfg_if;
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, LinkedList, VecDeque};
+use std::hash::{BuildHasher, Hash};
+use wasm_bindgen::prelude::*;
+
+/// Convert from a JS value.
+pub trait TryFromJs {
+    /// Convert from a JS value.
+    #[allow(clippy::missing_errors_doc)]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError>
+    where
+        Self: Sized;
+}
+
+pub(crate) trait TryFromJsExt: TryFromJs {
+    fn from_js_base(js: JsValue) -> crate::Result<Self>
+    where
+        Self: Sized;
+}
+
+impl<T: TryFromJs> TryFromJsExt for T {
+    fn from_js_base(js: JsValue) -> crate::Result<Self> {
+        Self::from_js(js).map_err(Into::into)
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for Option<T> {
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        if js.is_undefined() || js.is_null() {
+            Ok(None)
+        } else {
+            T::from_js(js).map(Some)
+        }
+    }
+}
+
+impl TryFromJs for f32 {
+    #[allow(clippy::cast_possible_truncation)]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        const MAX: f64 = f32::MAX as f64;
+        let big = <f64 as TryFromJs>::from_js(js)?;
+
+        if big > MAX {
+            Err(SimpleValueError::TooLarge(big))
+        } else {
+            Ok(big as f32)
+        }
+    }
+}
+
+impl TryFromJs for String {
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        match js.as_string() {
+            Some(v) => Ok(v),
+            None => Err(SimpleValueError::NotAString(js)),
+        }
+    }
+}
+
+impl TryFromJs for char {
+    #[allow(clippy::cast_precision_loss)]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        let string = String::from_js(js)?;
+        let mut chars = string.chars();
+
+        if let Some(ch) = chars.next() {
+            if chars.next().is_some() {
+                Err(SimpleValueError::TooLarge(string.len() as f64))
+            } else {
+                Ok(ch)
+            }
+        } else {
+            Err(SimpleValueError::TooSmall(0.0))
+        }
+    }
+}
+
+impl TryFromJs for JsValue {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        Ok(js)
+    }
+}
+
+fn js_to_list<L, T>(js: JsValue) -> Result<L, SimpleValueError>
+where
+    T: TryFromJs,
+    L: FromIterator<T>,
+{
+    if js.is_null() || js.is_undefined() {
+        return Ok(None::<T>.into_iter().collect());
+    }
+
+    match js.dyn_into::<js_sys::Array>() {
+        Ok(arr) => ArrayMapIter::new(arr.into_iter(), T::from_js).collect(),
+        Err(js) => Err(SimpleValueError::DynCast(js)),
+    }
+}
+
+pub(crate) fn js_to_map<M, T>(js: JsValue) -> Result<M, SimpleValueError>
+where
+    M: FromIterator<(String, T)>,
+    T: TryFromJs,
+{
+    fn parse_tuple<T: TryFromJs>(tuple: JsValue) -> Result<(String, T), SimpleValueError> {
+        match tuple.dyn_into::<js_sys::Array>() {
+            Ok(tuple) => {
+                let second = T::from_js(tuple.get(1))?;
+                let first = tuple.get(0);
+
+                match first.as_string() {
+                    Some(first) => Ok((first, second)),
+                    None => Err(SimpleValueError::NotAString(first)),
+                }
+            }
+            Err(e) => Err(SimpleValueError::DynCast(e)),
+        }
+    }
+
+    if js.is_null() || js.is_undefined() {
+        return Ok(None::<(String, T)>.into_iter().collect());
+    }
+
+    match js.dyn_into::<js_sys::Object>() {
+        Ok(obj) => js_sys::Object::entries(&obj)
+            .into_iter()
+            .map(parse_tuple)
+            .collect(),
+        Err(js) => Err(SimpleValueError::DynCast(js)),
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for BTreeMap<String, T> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_map(js)
+    }
+}
+
+impl<T: TryFromJs + Hash, H: BuildHasher + Default> TryFromJs for HashMap<String, T, H> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_map(js)
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for Vec<T> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_list(js)
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for VecDeque<T> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_list(js)
+    }
+}
+
+impl<T: TryFromJs + Hash + Eq, H: BuildHasher + Default> TryFromJs for HashSet<T, H> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_list(js)
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for BTreeSet<T>
+where
+    Self: FromIterator<T>,
+{
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_list(js)
+    }
+}
+
+impl<T: TryFromJs> TryFromJs for LinkedList<T> {
+    #[inline]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        js_to_list(js)
+    }
+}
+
+impl TryFromJs for usize {
+    #[allow(clippy::cast_possible_truncation)]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        cfg_if! {
+            if #[cfg(target_pointer_width = "64")] {
+                Ok(u64::from_js(js)? as usize)
+            } else if #[cfg(target_pointer_width = "32")] {
+                Ok(u32::from_js(js)? as usize)
+            } else if #[cfg(target_pointer_width = "16")] {
+                Ok(u16::from_js(js)? as usize)
+            } else {
+                let big = u128::from_js(js)?;
+                if let Ok(out) = big.try_into() {
+                    Ok(out)
+                } else {
+                    Err(SimpleValueError::TooLarge(f64::MAX))
+                }
+            }
+        }
+    }
+}
+
+impl TryFromJs for isize {
+    #[allow(clippy::cast_possible_truncation)]
+    fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+        cfg_if! {
+            if #[cfg(target_pointer_width = "64")] {
+                Ok(i64::from_js(js)? as isize)
+            } else if #[cfg(target_pointer_width = "32")] {
+                Ok(i32::from_js(js)? as isize)
+            } else if #[cfg(target_pointer_width = "16")] {
+                Ok(i16::from_js(js)? as isize)
+            } else {
+                let big = i128::from_js(js)?;
+                if let Ok(out) = big.try_into() {
+                    Ok(out)
+                } else if big < 0 {
+                    Err(SimpleValueError::TooSmall(f64::MIN))
+                } else  {
+                    Err(SimpleValueError::TooLarge(f64::MAX))
+                }
+            }
+        }
+    }
+}
+
+macro_rules! minmax {
+    ($min: expr, $max: expr, $js: ident, $as: ty, $err_ident: ident) => {{
+        let float = <f64 as TryFromJs>::from_js($js)?;
+
+        if float > $max {
+            Err($crate::error::SimpleValueError::TooLarge(float))
+        } else if float < $min {
+            Err($crate::error::SimpleValueError::$err_ident(float))
+        } else {
+            Ok(float as $as)
+        }
+    }};
+}
+
+macro_rules! impl_from_js {
+    (direct > $for: ty, $method: ident, $err: ident) => {
+        impl TryFromJs for $for {
+            fn from_js(js: wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                match js.$method() {
+                    Some(v) => Ok(v),
+                    None => Err($crate::error::SimpleValueError::$err(js)),
+                }
+            }
+        }
+    };
+    (signed, $err_variant: ident > $($ty: ty),+) => {
+        $(
+            impl TryFromJs for $ty {
+                #[allow(clippy::cast_possible_truncation)]
+                fn from_js(js: wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                    const MAX: f64 = <$ty>::MAX as f64;
+                    const MIN: f64 = <$ty>::MIN as f64;
+                    minmax!(MIN, MAX, js, $ty, $err_variant)
+                }
+            }
+        )+
+    };
+    (unsigned, $err_variant: ident > $($ty: ty),+) => {
+        $(
+            impl TryFromJs for $ty {
+                #[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
+                fn from_js(js: wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                    const MAX: f64 = <$ty>::MAX as f64;
+                    minmax!(0.0, MAX, js, $ty, $err_variant)
+                }
+            }
+        )+
+    };
+    (big > $($ty: ty),+ $(,)?) => {
+        $(impl TryFromJs for $ty {
+            fn from_js(js: wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                match js.try_into() {
+                    Ok(v) => Ok(v),
+                    Err(js) => Err($crate::error::SimpleValueError::DynCast(js)),
+                }
+            }
+        })+
+    };
+}
+
+impl_from_js!(direct > f64, as_f64, NotANumber);
+impl_from_js!(direct > bool, as_bool, NotABoolean);
+
+impl_from_js!(unsigned, Signed > u8, u16, u32);
+impl_from_js!(signed, TooSmall > i8, i16, i32);
+impl_from_js!(big > i64, u64, i128, u128);
diff --git a/src/primitive/switch.rs b/src/primitive/switch.rs
new file mode 100644
index 0000000..d356b27
--- /dev/null
+++ b/src/primitive/switch.rs
@@ -0,0 +1,127 @@
+use crate::error::SimpleValueError;
+
+/// A two-way branching [`TryToJs`](super::TryToJs)/[`TryFromJs`](super::TryFromJs) enum.
+///
+/// To be used, for example, when retrieving records from an [`ObjectStore`](crate::object_store::ObjectStore) that has
+/// different types of values via [`get_all`](crate::query_source::QuerySource::get_all).
+#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+#[allow(missing_docs)]
+pub enum Switch2<A, B> {
+    A(A),
+    B(B),
+}
+
+/// A three-way branching [`TryToJs`](super::TryToJs)/[`TryFromJs`](super::TryFromJs) enum.
+///
+/// To be used, for example, when retrieving records from an [`ObjectStore`](crate::object_store::ObjectStore) that has
+/// different types of values via [`get_all`](crate::query_source::QuerySource::get_all).
+#[allow(missing_docs)]
+#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+pub enum Switch3<A, B, C> {
+    A(A),
+    B(B),
+    C(C),
+}
+
+/// A four-way branching [`TryToJs`](super::TryToJs)/[`TryFromJs`](super::TryFromJs) enum.
+///
+/// To be used, for example, when retrieving records from an [`ObjectStore`](crate::object_store::ObjectStore) that has
+/// different types of values via [`get_all`](crate::query_source::QuerySource::get_all).
+#[allow(missing_docs)]
+#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+pub enum Switch4<A, B, C, D> {
+    A(A),
+    B(B),
+    C(C),
+    D(D),
+}
+
+/// A five-way branching [`TryToJs`](super::TryToJs)/[`TryFromJs`](super::TryFromJs) enum.
+///
+/// To be used, for example, when retrieving records from an [`ObjectStore`](crate::object_store::ObjectStore) that
+/// has different types of values via [`get_all`](crate::query_source::QuerySource::get_all).
+#[allow(missing_docs)]
+#[derive(Debug, Ord, PartialOrd, Eq, PartialEq, Hash, Clone, Copy)]
+pub enum Switch5<A, B, C, D, E> {
+    A(A),
+    B(B),
+    C(C),
+    D(D),
+    E(E),
+}
+
+macro_rules! from {
+    ($enum: ident <$($generic: ident),+>, $js: ident $impl: block) => {
+        #[allow(unused_qualifications)]
+        impl<$($generic),+> super::from_js::TryFromJs for $enum<$($generic),+>
+        where
+            $($generic: super::TryFromJs,)+
+        {
+            fn from_js($js: ::wasm_bindgen::JsValue) -> Result<Self, $crate::error::SimpleValueError> $impl
+        }
+    };
+    ($js: expr, $variant: ident, |$e: ident| $else: expr) => {
+        match <$variant as super::TryFromJs>::from_js($js) {
+            Ok(v) => Ok(Self::$variant(v)),
+            Err($e) => $else,
+        }
+    };
+}
+
+macro_rules! to {
+    ($enum: ident <$($generic: ident),+>) => {
+        #[allow(unused_qualifications)]
+        impl<$($generic),+> super::try_to_js::TryToJs for $enum<$($generic),+>
+        where
+            $($generic: super::TryToJs,)+
+        {
+            fn try_to_js(&self) -> crate::Result<::wasm_bindgen::JsValue> {
+                match self {
+                    $(Self::$generic(v) => super::TryToJs::try_to_js(v),)+
+                }
+            }
+        }
+    };
+}
+
+to!(Switch2<A, B>);
+from!(Switch2<A, B>, js {
+    from!(js.clone(), A, |e_a| {
+        from!(js, B, |e_b| Err(SimpleValueError::Switch(vec![e_a, e_b])))
+    })
+});
+
+to!(Switch3<A, B, C>);
+from!(Switch3<A, B, C>, js {
+    from!(js.clone(), A, |e_a| {
+        from!(js.clone(), B, |e_b| {
+            from!(js, C, |e_c| Err(SimpleValueError::Switch(vec![e_a, e_b, e_c])))
+        })
+    })
+});
+
+to!(Switch4<A, B, C, D>);
+
+from!(Switch4<A, B, C, D>, js {
+    from!(js.clone(), A, |e_a| {
+        from!(js.clone(), B, |e_b| {
+            from!(js.clone(), C, |e_c| {
+                from!(js, D, |e_d| Err(SimpleValueError::Switch(vec![e_a, e_b, e_c, e_d])))
+            })
+        })
+    })
+});
+
+to!(Switch5<A, B, C, D, E>);
+
+from!(Switch5<A, B, C, D, E>, js {
+    from!(js.clone(), A, |e_a| {
+        from!(js.clone(), B, |e_b| {
+            from!(js.clone(), C, |e_c| {
+                from!(js.clone(), D, |e_d| {
+                    from!(js, E, |e_e| Err(SimpleValueError::Switch(vec![e_a, e_b, e_c, e_d, e_e])))
+                })
+            })
+        })
+    })
+});
diff --git a/src/primitive/try_to_js.rs b/src/primitive/try_to_js.rs
new file mode 100644
index 0000000..9d7abae
--- /dev/null
+++ b/src/primitive/try_to_js.rs
@@ -0,0 +1,165 @@
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, LinkedList, VecDeque};
+use wasm_bindgen::prelude::*;
+
+/// Convert to a [`JsValue`].
+pub trait TryToJs {
+    /// Convert to a [`JsValue`].
+    #[allow(clippy::missing_errors_doc)]
+    fn try_to_js(&self) -> crate::Result<JsValue>;
+
+    /// Convert into a [`JsValue`].
+    #[inline]
+    #[allow(clippy::missing_errors_doc)]
+    fn try_into_js(self) -> crate::Result<JsValue>
+    where
+        Self: Sized,
+    {
+        self.try_to_js()
+    }
+}
+
+impl<T: TryToJs> TryToJs for &T {
+    #[inline]
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        TryToJs::try_to_js(*self)
+    }
+}
+
+impl<T: TryToJs> TryToJs for Option<T> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        match *self {
+            Some(ref v) => v.try_to_js(),
+            None => Ok(JsValue::UNDEFINED),
+        }
+    }
+}
+
+impl TryToJs for char {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        String::from(*self).try_to_js()
+    }
+}
+
+impl TryToJs for &str {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        Ok(JsValue::from_str(self))
+    }
+}
+
+impl TryToJs for String {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        self.as_str().try_to_js()
+    }
+}
+
+impl TryToJs for JsValue {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        Ok(self.clone())
+    }
+}
+
+impl TryToJs for bool {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        Ok(if *self { JsValue::TRUE } else { JsValue::FALSE })
+    }
+}
+
+fn list_to_js<E, It>(iter: It) -> crate::Result<JsValue>
+where
+    It: IntoIterator<Item = E>,
+    E: TryToJs,
+{
+    let arr = iter
+        .into_iter()
+        .map(TryToJs::try_into_js)
+        .collect::<crate::Result<js_sys::Array>>()?;
+
+    Ok(arr.unchecked_into())
+}
+
+pub(crate) fn map_to_js<K, V, It>(iter: It) -> crate::Result<JsValue>
+where
+    It: IntoIterator<Item = (K, V)>,
+    K: AsRef<str>,
+    V: TryToJs,
+{
+    let obj = js_sys::Object::new();
+
+    for (k, v) in iter {
+        let v = v.try_to_js()?;
+        js_sys::Reflect::set(&obj, &JsValue::from_str(k.as_ref()), &v)?;
+    }
+
+    Ok(obj.unchecked_into())
+}
+
+impl<K: AsRef<str>, V: TryToJs> TryToJs for BTreeMap<K, V> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        map_to_js(self.iter())
+    }
+}
+
+impl<K: AsRef<str>, V: TryToJs, H> TryToJs for HashMap<K, V, H> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        map_to_js(self.iter())
+    }
+}
+
+impl<T: TryToJs> TryToJs for &[T] {
+    #[inline]
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(*self)
+    }
+}
+
+impl<T: TryToJs, const N: usize> TryToJs for [T; N] {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(self.iter())
+    }
+}
+
+impl<T: TryToJs> TryToJs for Vec<T> {
+    #[inline]
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        self.as_slice().try_to_js()
+    }
+}
+
+impl<T: TryToJs> TryToJs for VecDeque<T> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(self.iter())
+    }
+}
+
+impl<T: TryToJs, H> TryToJs for HashSet<T, H> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(self.iter())
+    }
+}
+
+impl<T: TryToJs> TryToJs for BTreeSet<T> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(self.iter())
+    }
+}
+
+impl<T: TryToJs> TryToJs for LinkedList<T> {
+    fn try_to_js(&self) -> crate::Result<JsValue> {
+        list_to_js(self.iter())
+    }
+}
+
+macro_rules! impl_for_num {
+    ($($ty: ident),+ $(,)?) => {
+        $(
+            impl TryToJs for $ty {
+                #[inline]
+                fn try_to_js(&self) -> crate::Result<JsValue> {
+                    Ok(JsValue::from(*self))
+                }
+            }
+        )+
+    };
+}
+
+impl_for_num!(f32, f64, u8, u16, u32, u64, usize, i8, i16, i32, i64, isize, i128, u128);
diff --git a/src/query_source.rs b/src/query_source.rs
new file mode 100644
index 0000000..c128b1e
--- /dev/null
+++ b/src/query_source.rs
@@ -0,0 +1,359 @@
+//! Common functionality for making queries.
+
+use sealed::sealed;
+use wasm_bindgen::prelude::*;
+
+pub use get_all::{GetAll, GetAllKeys, GetAllRecords};
+use internal_macros::errdoc;
+
+use crate::internal_utils::SystemRepr;
+use crate::{KeyPath, KeyRange};
+pub use get::Get;
+pub use get_key::GetKey;
+use internal::QuerySourceInternal;
+
+pub use count::Count;
+
+iffeat! {
+    #[cfg(feature = "cursors")]
+    pub(crate) mod cursor;
+    pub use cursor::{AnyCursorBuilder, CursorBuilder, KeyCursorBuilder};
+}
+
+mod count;
+mod get;
+pub(crate) mod get_all;
+mod get_key;
+
+/// Common functionality for making queries.
+#[sealed]
+pub trait QuerySource {
+    /// Count the number of documents in the index/object store.
+    #[errdoc(QuerySource(InvalidStateError, TransactionInactiveError, DataError))]
+    fn count(&self) -> Count<Self>
+    where
+        Self: Sized;
+
+    /// Get one record from the object store or index. Returns the first match if a non-[only](KeyRange::Only) key is
+    /// provided and multiple records match.
+    #[errdoc(QuerySource(InvalidStateError, TransactionInactiveError, DataError))]
+    fn get<V, K, I>(&self, key: I) -> Get<Self, K, V>
+    where
+        Self: Sized,
+        I: Into<KeyRange<K>>;
+
+    /// Return the first matching key selected by the specified query.
+    #[errdoc(QuerySource(TransactionInactiveError, InvalidStateError, DataError))]
+    fn get_key<K, I>(&self, key_range: I) -> GetKey<Self, K>
+    where
+        Self: Sized,
+        I: Into<KeyRange<K>>;
+
+    /// Get all records in the object store or index.
+    #[errdoc(QuerySource(InvalidStateError, TransactionInactiveError, DataError))]
+    fn get_all<V>(&self) -> GetAllRecords<Self, V>
+    where
+        Self: Sized;
+
+    /// Get all keys in the object store or index.
+    #[errdoc(QuerySource(InvalidStateError, TransactionInactiveError, DataError))]
+    fn get_all_keys<K>(&self) -> GetAllKeys<Self, K>
+    where
+        Self: Sized;
+
+    /// Get the index/object store key path.
+    fn key_path(&self) -> Option<KeyPath>;
+
+    /// Get the index/object store name.
+    fn name(&self) -> String;
+
+    /// Set the index/object store name.
+    #[errdoc(QuerySource(InvalidStateError, TransactionInactiveError, ConstraintError))]
+    fn set_name(&self, name: &str);
+
+    iffeat! {
+        #[cfg(feature = "cursors")]
+
+        /// Open a cursor that iterates over the records in the index or object store.
+        /// Resolves to `None` if the cursor is empty.
+        #[errdoc(Cursor(TransactionInactiveError, DataErrorOpen, InvalidStateErrorOpen))]
+        fn open_cursor(&self) -> CursorBuilder<Self> where Self: Sized;
+
+        /// Open a cursor that iterates over the keys in the index or object store.
+        /// Resolves to `None` if the cursor is empty.
+        #[errdoc(Cursor(TransactionInactiveError, DataErrorOpen, InvalidStateErrorOpen))]
+        fn open_key_cursor(&self) -> KeyCursorBuilder<Self> where Self: Sized;
+    }
+}
+
+#[sealed]
+impl<T: SystemRepr<Repr = R>, R: QuerySourceInternal> QuerySource for T {
+    #[inline]
+    fn name(&self) -> String {
+        self.as_sys().name()
+    }
+
+    #[inline]
+    fn set_name(&self, name: &str) {
+        self.as_sys().set_name(name);
+    }
+
+    #[inline]
+    fn count(&self) -> Count<Self> {
+        Count::new(self)
+    }
+
+    fn key_path(&self) -> Option<KeyPath> {
+        match self.as_sys().key_path() {
+            Ok(path) if !path.is_null() => Some(path.into()),
+            _ => None,
+        }
+    }
+
+    fn get<V, K, I>(&self, key: I) -> Get<Self, K, V>
+    where
+        I: Into<KeyRange<K>>,
+    {
+        Get::new(self, key.into())
+    }
+
+    fn get_key<K, I>(&self, key_range: I) -> GetKey<Self, K>
+    where
+        I: Into<KeyRange<K>>,
+    {
+        GetKey::new(self, key_range.into())
+    }
+
+    #[inline]
+    fn get_all<V>(&self) -> GetAllRecords<Self, V> {
+        GetAllRecords::new(self)
+    }
+
+    #[inline]
+    fn get_all_keys<K>(&self) -> GetAllKeys<Self, K> {
+        GetAllKeys::new(self)
+    }
+
+    iffeat! {
+        #[cfg(feature = "cursors")]
+        #[inline]
+        fn open_cursor(&self) -> CursorBuilder<Self> {
+            CursorBuilder::new(self)
+        }
+
+        #[inline]
+        fn open_key_cursor(&self) -> KeyCursorBuilder<Self> {
+            KeyCursorBuilder::new(self)
+        }
+    }
+}
+
+pub(crate) mod internal {
+    use wasm_bindgen::prelude::*;
+
+    /// Internal representation of a [`QuerySource`](super::QuerySource).
+    #[::sealed::sealed(pub(super))]
+    pub trait QuerySourceInternal {
+        #[doc(hidden)]
+        fn name(&self) -> String;
+
+        #[doc(hidden)]
+        fn set_name(&self, name: &str);
+
+        #[doc(hidden)]
+        fn count(&self) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn count_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn key_path(&self) -> Result<JsValue, JsValue>;
+
+        #[doc(hidden)]
+        fn get(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all(&self) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all_with_key_and_limit(
+            &self,
+            key: &JsValue,
+            limit: u32,
+        ) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all_keys(&self) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all_keys_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+        #[doc(hidden)]
+        fn get_all_keys_with_key_and_limit(
+            &self,
+            key: &JsValue,
+            limit: u32,
+        ) -> Result<web_sys::IdbRequest, JsValue>;
+
+        iffeat! {
+            #[cfg(feature = "cursors")]
+            #[doc(hidden)]
+            fn open_cursor(&self) -> Result<web_sys::IdbRequest, JsValue>;
+
+            #[doc(hidden)]
+            fn open_cursor_with_range(&self, range: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+            #[doc(hidden)]
+            fn open_cursor_with_range_and_direction(
+                &self,
+                range: &JsValue,
+                direction: web_sys::IdbCursorDirection,
+            ) -> Result<web_sys::IdbRequest, JsValue>;
+
+            #[doc(hidden)]
+            fn open_key_cursor(&self) -> Result<web_sys::IdbRequest, JsValue>;
+
+            #[doc(hidden)]
+            fn open_key_cursor_with_range(&self, range: &JsValue) -> Result<web_sys::IdbRequest, JsValue>;
+
+            #[doc(hidden)]
+            fn open_key_cursor_with_range_and_direction(
+                &self,
+                range: &JsValue,
+                direction: web_sys::IdbCursorDirection,
+            ) -> Result<web_sys::IdbRequest, JsValue>;
+        }
+    }
+}
+
+macro_rules! impl_internal {
+    ($for: ty) => {
+        #[::sealed::sealed]
+        impl internal::QuerySourceInternal for $for {
+            #[inline]
+            fn name(&self) -> String {
+                <$for>::name(self)
+            }
+
+            #[inline]
+            fn set_name(&self, name: &str) {
+                <$for>::set_name(self, name);
+            }
+
+            #[inline]
+            fn count(&self) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::count(self)
+            }
+
+            #[inline]
+            fn count_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::count_with_key(self, key)
+            }
+
+            #[inline]
+            fn key_path(&self) -> Result<JsValue, JsValue> {
+                <$for>::key_path(self)
+            }
+
+            #[inline]
+            fn get(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get(self, key)
+            }
+
+            #[inline]
+            fn get_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_key(self, key)
+            }
+
+            #[inline]
+            fn get_all(&self) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all(self)
+            }
+
+            #[inline]
+            fn get_all_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all_with_key(self, key)
+            }
+
+            #[inline]
+            fn get_all_with_key_and_limit(
+                &self,
+                key: &JsValue,
+                limit: u32,
+            ) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all_with_key_and_limit(self, key, limit)
+            }
+
+            #[inline]
+            fn get_all_keys(&self) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all_keys(self)
+            }
+
+            #[inline]
+            fn get_all_keys_with_key(&self, key: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all_keys_with_key(self, key)
+            }
+
+            #[inline]
+            fn get_all_keys_with_key_and_limit(
+                &self,
+                key: &JsValue,
+                limit: u32,
+            ) -> Result<web_sys::IdbRequest, JsValue> {
+                <$for>::get_all_keys_with_key_and_limit(self, key, limit)
+            }
+
+            iffeat! {
+                #[cfg(feature = "cursors")]
+                #[inline]
+                fn open_cursor(&self) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_cursor(self)
+                }
+
+                #[inline]
+                fn open_cursor_with_range(&self, range: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_cursor_with_range(self, range)
+                }
+
+                #[inline]
+                fn open_cursor_with_range_and_direction(
+                    &self,
+                    range: &JsValue,
+                    direction: web_sys::IdbCursorDirection,
+                ) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_cursor_with_range_and_direction(self, range, direction)
+                }
+
+                #[inline]
+                fn open_key_cursor(&self) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_key_cursor(self)
+                }
+
+                #[inline]
+                 fn open_key_cursor_with_range(&self, range: &JsValue) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_key_cursor_with_range(self, range)
+                }
+
+                #[inline]
+                fn open_key_cursor_with_range_and_direction(
+                    &self,
+                    range: &JsValue,
+                    direction: web_sys::IdbCursorDirection,
+                ) -> Result<web_sys::IdbRequest, JsValue> {
+                    <$for>::open_key_cursor_with_range_and_direction(self, range, direction)
+                }
+            }
+        }
+    };
+}
+
+impl_internal!(web_sys::IdbObjectStore);
+
+#[cfg(feature = "indices")]
+impl_internal!(web_sys::IdbIndex);
diff --git a/src/query_source/count.rs b/src/query_source/count.rs
new file mode 100644
index 0000000..0f33323
--- /dev/null
+++ b/src/query_source/count.rs
@@ -0,0 +1,108 @@
+use super::QuerySourceInternal;
+use crate::future::BasicRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::TryToJs;
+use crate::KeyRange;
+use internal_macros::BuildIntoFut;
+use sealed::sealed;
+
+/// Builder for [`QuerySource::count`](super::QuerySource::count).
+#[derive(BuildIntoFut)]
+#[must_use]
+pub struct Count<'q, Qs, Q = ()> {
+    query_source: &'q Qs,
+    query: Q,
+}
+
+impl<'q, Qs> Count<'q, Qs> {
+    #[inline]
+    pub(super) fn new<Sys>(query_source: &'q Qs) -> Self
+    where
+        Sys: QuerySourceInternal,
+        Qs: SystemRepr<Repr = Sys>,
+    {
+        Self {
+            query_source,
+            query: (),
+        }
+    }
+}
+
+impl<'q, Qs, Q> Count<'q, Qs, Q> {
+    /// Set the query.
+    pub fn with_query<KR, I>(self, query: I) -> Count<'q, Qs, KeyRange<KR>>
+    where
+        I: Into<KeyRange<KR>>,
+    {
+        Count {
+            query_source: self.query_source,
+            query: query.into(),
+        }
+    }
+}
+
+#[sealed]
+impl<Qs, Sys> crate::BuildPrimitive for Count<'_, Qs>
+where
+    Qs: SystemRepr<Repr = Sys>,
+    Sys: QuerySourceInternal,
+{
+    type Fut = BasicRequest<u32>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let req = self.query_source.as_sys().count()?;
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[sealed]
+impl<Qs, Sys, KR> crate::BuildPrimitive for Count<'_, Qs, KeyRange<KR>>
+where
+    Qs: SystemRepr<Repr = Sys>,
+    Sys: QuerySourceInternal,
+    KeyRange<KR>: TryToJs,
+{
+    type Fut = BasicRequest<u32>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let js = self.query.try_to_js()?;
+        let req = self.query_source.as_sys().count_with_key(&js)?;
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::{BuildPrimitive, SerialiseToJs};
+
+    #[sealed]
+    impl<Qs, Sys> crate::BuildSerde for Count<'_, Qs>
+    where
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        type Fut = BasicRequest<u32>;
+
+        #[inline]
+        fn serde(self) -> crate::Result<Self::Fut> {
+            Self::primitive(self)
+        }
+    }
+
+    #[sealed]
+    impl<Qs, Sys, KR> crate::BuildSerde for Count<'_, Qs, KeyRange<KR>>
+    where
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<KR>: SerialiseToJs,
+    {
+        type Fut = BasicRequest<u32>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let js = self.query.serialise_to_js()?;
+            let req = self.query_source.as_sys().count_with_key(&js)?;
+
+            Ok(BasicRequest::new_primitive(req))
+        }
+    }
+};
diff --git a/src/query_source/cursor.rs b/src/query_source/cursor.rs
new file mode 100644
index 0000000..85bfe23
--- /dev/null
+++ b/src/query_source/cursor.rs
@@ -0,0 +1,354 @@
+use super::QuerySourceInternal;
+use crate::cursor::CursorDirection;
+use crate::future::{CursorRequest, PollUnpinned};
+use crate::internal_utils::SystemRepr;
+use crate::primitive::TryToJs;
+use crate::KeyRange;
+use derive_more::Debug;
+use internal_macros::BuildIntoFut;
+use kind::CursorKind;
+use sealed::sealed;
+use std::marker::PhantomData;
+use wasm_bindgen::prelude::*;
+
+/// Builder for a [`Cursor`](crate::cursor::Cursor).
+pub type CursorBuilder<'a, Qs, Q = (), D = ()> = AnyCursorBuilder<'a, kind::Record, Qs, Q, D>;
+
+/// Builder for a [`KeyCursor`](crate::cursor::KeyCursor).
+pub type KeyCursorBuilder<'a, Qs, Q = (), D = ()> = AnyCursorBuilder<'a, kind::Key, Qs, Q, D>;
+
+/// Builder for a [`Cursor`](crate::cursor::Cursor) & [`KeyCursor`](crate::cursor::KeyCursor).
+#[derive(Debug, BuildIntoFut)]
+#[must_use]
+pub struct AnyCursorBuilder<'qs, K, Qs, Q = (), D = ()> {
+    #[debug(skip)]
+    query_source: &'qs Qs,
+    query: Q,
+    direction: D,
+
+    #[debug(skip)]
+    kind: PhantomData<K>,
+}
+
+impl<'qs, K, Qs> AnyCursorBuilder<'qs, K, Qs> {
+    #[inline]
+    pub(super) fn new<Sys>(query_source: &'qs Qs) -> Self
+    where
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        Self {
+            query_source,
+            query: (),
+            direction: (),
+            kind: PhantomData,
+        }
+    }
+}
+
+impl<'qs, K, Qs, Q, D> AnyCursorBuilder<'qs, K, Qs, Q, D> {
+    /// Set the key or key range to be queried.
+    pub fn with_query<QK, I>(self, query: I) -> AnyCursorBuilder<'qs, K, Qs, KeyRange<QK>, D>
+    where
+        I: Into<KeyRange<QK>>,
+    {
+        AnyCursorBuilder {
+            query_source: self.query_source,
+            query: query.into(),
+            direction: self.direction,
+            kind: PhantomData,
+        }
+    }
+
+    /// Set the direction of the cursor.
+    #[inline]
+    pub fn with_direction(
+        self,
+        direction: CursorDirection,
+    ) -> AnyCursorBuilder<'qs, K, Qs, Q, CursorDirection> {
+        AnyCursorBuilder {
+            query_source: self.query_source,
+            query: self.query,
+            direction,
+            kind: PhantomData,
+        }
+    }
+}
+
+impl<K, Qs, Q, D> Clone for AnyCursorBuilder<'_, K, Qs, Q, D>
+where
+    Q: Clone,
+    D: Clone,
+{
+    fn clone(&self) -> Self {
+        Self {
+            query_source: self.query_source,
+            query: self.query.clone(),
+            direction: self.direction.clone(),
+            kind: PhantomData,
+        }
+    }
+}
+
+// Build impls
+const _: () = {
+    #[sealed]
+    impl<'qs, Sys, K, Qs, Q> crate::BuildPrimitive
+        for AnyCursorBuilder<'qs, K, Qs, KeyRange<Q>, CursorDirection>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<Q>: TryToJs,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let query = self.query.try_to_js()?;
+            let req = K::open_w_range_n_direction(self.query_source, query, self.direction)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs, Q> crate::BuildPrimitive for AnyCursorBuilder<'qs, K, Qs, KeyRange<Q>>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<Q>: TryToJs,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let query = self.query.try_to_js()?;
+            let req = K::open_w_range(self.query_source, query)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs> crate::BuildPrimitive for AnyCursorBuilder<'qs, K, Qs, (), CursorDirection>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let req =
+                K::open_w_range_n_direction(self.query_source, JsValue::UNDEFINED, self.direction)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs> crate::BuildPrimitive for AnyCursorBuilder<'qs, K, Qs>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let req = K::open(self.query_source)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+};
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::serde::SerialiseToJs;
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs, Q> crate::BuildSerde
+        for AnyCursorBuilder<'qs, K, Qs, KeyRange<Q>, CursorDirection>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<Q>: SerialiseToJs,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let query = self.query.serialise_to_js()?;
+            let req = K::open_w_range_n_direction(self.query_source, query, self.direction)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs, Q> crate::BuildSerde for AnyCursorBuilder<'qs, K, Qs, KeyRange<Q>>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<Q>: SerialiseToJs,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let query = self.query.serialise_to_js()?;
+            let req = K::open_w_range(self.query_source, query)?;
+            Ok(CursorRequest::new(req, self.query_source))
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs> crate::BuildSerde for AnyCursorBuilder<'qs, K, Qs, (), CursorDirection>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        #[inline]
+        fn serde(self) -> crate::Result<Self::Fut> {
+            crate::BuildPrimitive::primitive(self)
+        }
+    }
+
+    #[sealed]
+    impl<'qs, Sys, K, Qs> crate::BuildSerde for AnyCursorBuilder<'qs, K, Qs>
+    where
+        K: CursorKind,
+        CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>: PollUnpinned + Unpin,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        type Fut = CursorRequest<'qs, K::Cursor<'qs, Qs>, Qs>;
+
+        #[inline]
+        fn serde(self) -> crate::Result<Self::Fut> {
+            crate::BuildPrimitive::primitive(self)
+        }
+    }
+};
+
+pub(crate) mod kind {
+    #[allow(missing_docs)]
+    pub struct Record();
+    #[allow(missing_docs)]
+    pub struct Key();
+
+    use super::super::QuerySourceInternal;
+    use crate::cursor::CursorDirection;
+    use crate::internal_utils::SystemRepr;
+    use sealed::sealed;
+    use wasm_bindgen::prelude::*;
+
+    /// The type of cursor being built.
+    #[sealed]
+    pub trait CursorKind {
+        /// The cursor returned by opening with this type.
+        type Cursor<'a, Qs: 'a>;
+
+        #[doc(hidden)]
+        fn open<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+
+        #[doc(hidden)]
+        fn open_w_range<Qs, Sys>(qs: &Qs, query: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+
+        #[doc(hidden)]
+        fn open_w_range_n_direction<Qs, Sys>(
+            qs: &Qs,
+            query: JsValue,
+            direction: CursorDirection,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+    }
+
+    #[sealed]
+    impl CursorKind for Record {
+        type Cursor<'a, Qs: 'a> = crate::cursor::Cursor<'a, Qs>;
+
+        #[inline]
+        fn open<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().open_cursor()
+        }
+
+        #[inline]
+        fn open_w_range<Qs, Sys>(qs: &Qs, query: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().open_cursor_with_range(&query)
+        }
+
+        #[inline]
+        fn open_w_range_n_direction<Qs, Sys>(
+            qs: &Qs,
+            query: JsValue,
+            direction: CursorDirection,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys()
+                .open_cursor_with_range_and_direction(&query, direction)
+        }
+    }
+
+    #[sealed]
+    impl CursorKind for Key {
+        type Cursor<'a, Qs: 'a> = crate::cursor::KeyCursor<'a, Qs>;
+
+        #[inline]
+        fn open<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().open_key_cursor()
+        }
+
+        #[inline]
+        fn open_w_range<Qs, Sys>(qs: &Qs, query: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().open_key_cursor_with_range(&query)
+        }
+
+        #[inline]
+        fn open_w_range_n_direction<Qs, Sys>(
+            qs: &Qs,
+            query: JsValue,
+            direction: CursorDirection,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys()
+                .open_key_cursor_with_range_and_direction(&query, direction)
+        }
+    }
+}
diff --git a/src/query_source/get.rs b/src/query_source/get.rs
new file mode 100644
index 0000000..cf3a67e
--- /dev/null
+++ b/src/query_source/get.rs
@@ -0,0 +1,70 @@
+use super::QuerySourceInternal;
+use crate::future::BasicRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryToJs};
+use crate::KeyRange;
+use fancy_constructor::new;
+use internal_macros::BuildIntoFut;
+use sealed::sealed;
+use std::marker::PhantomData;
+
+/// Builder for [`QuerySource::get`](super::QuerySource::get).
+#[derive(new, BuildIntoFut)]
+#[new(vis(pub(super)))]
+#[must_use]
+pub struct Get<'a, Qs, K, V> {
+    query_source: &'a Qs,
+    key: KeyRange<K>,
+
+    #[new(val(PhantomData))]
+    t_value: PhantomData<V>,
+}
+
+#[sealed]
+impl<Qs, K, V, Sys> crate::BuildPrimitive for Get<'_, Qs, K, V>
+where
+    Qs: SystemRepr<Repr = Sys>,
+    KeyRange<K>: TryToJs,
+    Option<V>: TryFromJs,
+    Sys: QuerySourceInternal,
+{
+    type Fut = BasicRequest<Option<V>>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let Self {
+            query_source,
+            key,
+            t_value: _,
+        } = self;
+
+        let js = key.try_to_js()?;
+        let req = query_source.as_sys().get(&js)?;
+
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[sealed]
+#[cfg(feature = "serde")]
+impl<Q, K, V, Sys> crate::BuildSerde for Get<'_, Q, K, V>
+where
+    Q: SystemRepr<Repr = Sys>,
+    KeyRange<K>: crate::serde::SerialiseToJs,
+    Option<V>: crate::serde::DeserialiseFromJs,
+    Sys: QuerySourceInternal,
+{
+    type Fut = BasicRequest<Option<V>>;
+
+    fn serde(self) -> crate::Result<Self::Fut> {
+        let Self {
+            query_source,
+            key,
+            t_value: _,
+        } = self;
+
+        let js = crate::serde::SerialiseToJs::serialise_to_js(&key)?;
+        let req = query_source.as_sys().get(&js)?;
+
+        Ok(BasicRequest::new_ser(req))
+    }
+}
diff --git a/src/query_source/get_all.rs b/src/query_source/get_all.rs
new file mode 100644
index 0000000..e0a9c0f
--- /dev/null
+++ b/src/query_source/get_all.rs
@@ -0,0 +1,346 @@
+use super::QuerySourceInternal;
+use crate::future::GetAllPrimitiveRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryToJs};
+use crate::KeyRange;
+use derive_more::Debug;
+use internal_macros::BuildIntoFut;
+use kind::GetAllKind;
+use sealed::sealed;
+use std::marker::PhantomData;
+use wasm_bindgen::prelude::*;
+
+/// Builder for [`get_all`](super::QuerySource::get_all).
+///
+/// Retrieves all the keys/records in the index or object store if no [query](GetAll::with_query)
+/// is provided.
+pub type GetAllRecords<'a, Qs, T, Q = (), C = ()> = GetAll<'a, kind::Record, Qs, T, Q, C>;
+
+/// Builder for [`get_all_keys`](super::QuerySource::get_all_keys).
+///
+/// Retrieves all the keys/records in the index or object store if no [query](GetAll::with_query)
+/// is provided.
+pub type GetAllKeys<'a, Qs, T, Q = (), C = ()> = GetAll<'a, kind::Key, Qs, T, Q, C>;
+
+/// Builder for [`get_all`](super::QuerySource::get_all) &
+/// [`get_all_keys`](super::QuerySource::get_all_keys).
+///
+/// Retrieves all the keys/records in the index or object store if no [query](GetAll::with_query)
+/// is provided.
+#[derive(Debug, BuildIntoFut)]
+#[must_use]
+pub struct GetAll<'a, K, Qs, T, Q = (), C = ()> {
+    #[debug(skip)]
+    query_source: &'a Qs,
+    query: Q,
+    limit: C,
+
+    #[debug(skip)]
+    marker: PhantomData<(K, T)>,
+}
+
+impl<'a, K, Qs, T> GetAll<'a, K, Qs, T> {
+    #[inline]
+    pub(super) fn new<Sys>(query_source: &'a Qs) -> Self
+    where
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+    {
+        Self {
+            query_source,
+            query: (),
+            limit: (),
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<'a, K, Qs, T, Q, C> GetAll<'a, K, Qs, T, Q, C> {
+    /// Set the key or key range to be queried.
+    pub fn with_query<QK, I>(self, query: I) -> GetAll<'a, K, Qs, T, KeyRange<QK>, C>
+    where
+        I: Into<KeyRange<QK>>,
+    {
+        GetAll {
+            query_source: self.query_source,
+            query: query.into(),
+            limit: self.limit,
+            marker: PhantomData,
+        }
+    }
+
+    /// Set the maximum number of results to return.
+    #[inline]
+    pub fn with_limit(self, limit: u32) -> GetAll<'a, K, Qs, T, Q, u32> {
+        GetAll {
+            query_source: self.query_source,
+            query: self.query,
+            limit,
+            marker: PhantomData,
+        }
+    }
+}
+
+impl<K, Qs, T, Q, C> Clone for GetAll<'_, K, Qs, T, Q, C>
+where
+    Q: Clone,
+    C: Clone,
+{
+    fn clone(&self) -> Self {
+        Self {
+            query_source: self.query_source,
+            query: self.query.clone(),
+            limit: self.limit.clone(),
+            marker: PhantomData,
+        }
+    }
+}
+
+// BuildPrimitive impls
+const _: () = {
+    #[sealed::sealed]
+    impl<K, Qs, Sys, T> crate::BuildPrimitive for GetAll<'_, K, Qs, T>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: TryFromJs,
+    {
+        type Fut = GetAllPrimitiveRequest<T>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let req = K::get(self.query_source)?;
+            Ok(GetAllPrimitiveRequest::get_all_primitive(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T, KR> crate::BuildPrimitive for GetAll<'_, K, Qs, T, KeyRange<KR>>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: TryFromJs,
+        KeyRange<KR>: TryToJs,
+    {
+        type Fut = GetAllPrimitiveRequest<T>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let js = self.query.try_to_js()?;
+            let req = K::get_with_key(self.query_source, js)?;
+            Ok(GetAllPrimitiveRequest::get_all_primitive(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T> crate::BuildPrimitive for GetAll<'_, K, Qs, T, (), u32>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: TryFromJs,
+    {
+        type Fut = GetAllPrimitiveRequest<T>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let req = K::get_with_key_limit(self.query_source, JsValue::UNDEFINED, self.limit)?;
+            Ok(GetAllPrimitiveRequest::get_all_primitive(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T, KR> crate::BuildPrimitive for GetAll<'_, K, Qs, T, KeyRange<KR>, u32>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: TryFromJs,
+        KeyRange<KR>: TryToJs,
+    {
+        type Fut = GetAllPrimitiveRequest<T>;
+
+        fn primitive(self) -> crate::Result<Self::Fut> {
+            let js = self.query.try_to_js()?;
+            let req = K::get_with_key_limit(self.query_source, js, self.limit)?;
+            Ok(GetAllPrimitiveRequest::get_all_primitive(req))
+        }
+    }
+};
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::future::GetAllSerdeRequest;
+    use crate::serde::{DeserialiseFromJs, SerialiseToJs};
+
+    #[sealed]
+    impl<K, Qs, Sys, T> crate::BuildSerde for GetAll<'_, K, Qs, T>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: DeserialiseFromJs,
+    {
+        type Fut = GetAllSerdeRequest<T>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let req = K::get(self.query_source)?;
+            Ok(GetAllSerdeRequest::get_all_serde(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T, KR> crate::BuildSerde for GetAll<'_, K, Qs, T, KeyRange<KR>>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: DeserialiseFromJs,
+        KeyRange<KR>: SerialiseToJs,
+    {
+        type Fut = GetAllSerdeRequest<T>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let js = self.query.serialise_to_js()?;
+            let req = K::get_with_key(self.query_source, js)?;
+            Ok(GetAllSerdeRequest::get_all_serde(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T> crate::BuildSerde for GetAll<'_, K, Qs, T, (), u32>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: DeserialiseFromJs,
+    {
+        type Fut = GetAllSerdeRequest<T>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let req = K::get_with_key_limit(self.query_source, JsValue::UNDEFINED, self.limit)?;
+            Ok(GetAllSerdeRequest::get_all_serde(req))
+        }
+    }
+
+    #[sealed]
+    impl<K, Qs, Sys, T, KR> crate::BuildSerde for GetAll<'_, K, Qs, T, KeyRange<KR>, u32>
+    where
+        K: GetAllKind,
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        T: DeserialiseFromJs,
+        KeyRange<KR>: SerialiseToJs,
+    {
+        type Fut = GetAllSerdeRequest<T>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let js = self.query.serialise_to_js()?;
+            let req = K::get_with_key_limit(self.query_source, js, self.limit)?;
+            Ok(GetAllSerdeRequest::get_all_serde(req))
+        }
+    }
+};
+
+pub(crate) mod kind {
+    use super::super::QuerySourceInternal;
+    use crate::internal_utils::SystemRepr;
+    use sealed::sealed;
+    use wasm_bindgen::prelude::*;
+
+    #[allow(missing_docs)]
+    pub struct Record();
+
+    #[allow(missing_docs)]
+    pub struct Key();
+
+    /// Type of [`get_all`](super::super::QuerySource::get_all) operation.
+    #[sealed]
+    pub trait GetAllKind {
+        #[doc(hidden)]
+        fn get<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+
+        #[doc(hidden)]
+        fn get_with_key<Qs, Sys>(qs: &Qs, key: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+
+        #[doc(hidden)]
+        fn get_with_key_limit<Qs, Sys>(
+            qs: &Qs,
+            key: JsValue,
+            limit: u32,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal;
+    }
+
+    #[sealed]
+    impl GetAllKind for Record {
+        #[inline]
+        fn get<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all()
+        }
+
+        #[inline]
+        fn get_with_key<Qs, Sys>(qs: &Qs, key: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all_with_key(&key)
+        }
+
+        #[inline]
+        fn get_with_key_limit<Qs, Sys>(
+            qs: &Qs,
+            key: JsValue,
+            limit: u32,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all_with_key_and_limit(&key, limit)
+        }
+    }
+
+    #[sealed]
+    impl GetAllKind for Key {
+        fn get<Qs, Sys>(qs: &Qs) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all_keys()
+        }
+
+        fn get_with_key<Qs, Sys>(qs: &Qs, key: JsValue) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all_keys_with_key(&key)
+        }
+
+        fn get_with_key_limit<Qs, Sys>(
+            qs: &Qs,
+            key: JsValue,
+            limit: u32,
+        ) -> Result<web_sys::IdbRequest, JsValue>
+        where
+            Qs: SystemRepr<Repr = Sys>,
+            Sys: QuerySourceInternal,
+        {
+            qs.as_sys().get_all_keys_with_key_and_limit(&key, limit)
+        }
+    }
+}
diff --git a/src/query_source/get_key.rs b/src/query_source/get_key.rs
new file mode 100644
index 0000000..748ea30
--- /dev/null
+++ b/src/query_source/get_key.rs
@@ -0,0 +1,72 @@
+use super::QuerySourceInternal;
+use crate::future::BasicRequest;
+use crate::internal_utils::SystemRepr;
+use crate::primitive::{TryFromJs, TryToJs};
+use crate::KeyRange;
+use fancy_constructor::new;
+use internal_macros::BuildIntoFut;
+use sealed::sealed;
+use std::marker::PhantomData;
+
+/// Builder for [`QuerySource::get_key`](super::QuerySource::get_key).
+#[derive(new, BuildIntoFut)]
+#[new(vis(pub(super)))]
+#[must_use]
+pub struct GetKey<'a, Qs, K, KT = K> {
+    query_source: &'a Qs,
+    key_range: KeyRange<K>,
+
+    #[new(val(PhantomData))]
+    _key_type: PhantomData<KT>,
+}
+
+impl<'a, Qs, K, KT> GetKey<'a, Qs, K, KT> {
+    /// Set the key type returned by the query.
+    #[inline]
+    pub fn with_key_type<KT2>(self) -> GetKey<'a, Qs, K, KT2> {
+        GetKey {
+            query_source: self.query_source,
+            key_range: self.key_range,
+            _key_type: PhantomData,
+        }
+    }
+}
+
+#[sealed]
+impl<Sys, Qs, K, KT> crate::BuildPrimitive for GetKey<'_, Qs, K, KT>
+where
+    Qs: SystemRepr<Repr = Sys>,
+    Sys: QuerySourceInternal,
+    KeyRange<K>: TryToJs,
+    Option<KT>: TryFromJs,
+{
+    type Fut = BasicRequest<Option<KT>>;
+
+    fn primitive(self) -> crate::Result<Self::Fut> {
+        let key = self.key_range.try_into_js()?;
+        let req = self.query_source.as_sys().get_key(&key)?;
+        Ok(BasicRequest::new_primitive(req))
+    }
+}
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::serde::{DeserialiseFromJs, SerialiseToJs};
+
+    #[sealed]
+    impl<Sys, Qs, K, KT> crate::BuildSerde for GetKey<'_, Qs, K, KT>
+    where
+        Qs: SystemRepr<Repr = Sys>,
+        Sys: QuerySourceInternal,
+        KeyRange<K>: SerialiseToJs,
+        Option<KT>: DeserialiseFromJs,
+    {
+        type Fut = BasicRequest<Option<KT>>;
+
+        fn serde(self) -> crate::Result<Self::Fut> {
+            let key = self.key_range.serialise_to_js()?;
+            let req = self.query_source.as_sys().get_key(&key)?;
+            Ok(BasicRequest::new_ser(req))
+        }
+    }
+};
diff --git a/src/request/futures/count_future.rs b/src/request/futures/count_future.rs
deleted file mode 100644
index 4cc2ec8..0000000
--- a/src/request/futures/count_future.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::pin::Pin;
-
-use delegate_display::DelegateDebug;
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-use crate::internal_utils::NightlyUnwrap;
-
-use super::{IdbRequestFuture, ResponseFormattingFuture};
-
-/// A [`Future`](std::future::Future) for [count](crate::idb_query_source::IdbQuerySource::count) and
-/// related methods
-#[derive(DelegateDebug)]
-pub struct CountFuture(IdbRequestFuture);
-impl_result_formatting_struct_commons!(CountFuture);
-
-impl ResponseFormattingFuture<u32> for CountFuture {
-    #[allow(clippy::cast_sign_loss, clippy::cast_possible_truncation)]
-    fn format_response(v: Result<Option<JsValue>, DomException>) -> Result<u32, DomException> {
-        Ok(v?.nightly_unwrap().as_f64().unwrap() as u32)
-    }
-
-    #[inline]
-    fn inner(&self) -> &IdbRequestFuture {
-        &self.0
-    }
-}
-
-impl_result_formatting_future_future!(CountFuture, u32);
diff --git a/src/request/futures/cursor/idb_cursor_advancement_future.rs b/src/request/futures/cursor/idb_cursor_advancement_future.rs
deleted file mode 100644
index b0dd101..0000000
--- a/src/request/futures/cursor/idb_cursor_advancement_future.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-use delegate_display::DelegateDebug;
-use fancy_constructor::new;
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-use crate::internal_utils::NightlyUnwrap;
-
-use super::super::IdbRequestFuture;
-
-/// Future for cursors' `advance()` and `continue()`
-#[derive(DelegateDebug, new)]
-pub(crate) struct IdbCursorAdvancementFuture(IdbRequestFuture);
-
-impl IdbCursorAdvancementFuture {
-    fn on_done(res: Result<Option<JsValue>, DomException>) -> Result<bool, DomException> {
-        Ok(!res?.nightly_unwrap().is_null())
-    }
-}
-
-impl Future for IdbCursorAdvancementFuture {
-    type Output = Result<bool, DomException>;
-
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.0.do_poll(ctx).map(Self::on_done)
-    }
-}
diff --git a/src/request/futures/cursor/idb_cursor_future.rs b/src/request/futures/cursor/idb_cursor_future.rs
deleted file mode 100644
index 3976609..0000000
--- a/src/request/futures/cursor/idb_cursor_future.rs
+++ /dev/null
@@ -1,65 +0,0 @@
-use std::future::Future;
-use std::pin::Pin;
-use std::rc::Rc;
-use std::task::{Context, Poll};
-
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::DomException;
-
-use super::super::IdbRequestFuture;
-use crate::idb_cursor::IdbCursor;
-use crate::idb_query_source::IdbQuerySource;
-use crate::internal_utils::NightlyUnwrap;
-use crate::request::IdbRequestRef;
-
-/// A [`Future`] that resolves to an [`IdbCursor`]
-#[derive(Debug)]
-pub struct IdbCursorFuture<'a, T: IdbQuerySource> {
-    inner: IdbRequestFuture,
-    source: &'a T,
-    req: Rc<IdbRequestRef>,
-}
-
-impl<'a, T: IdbQuerySource> IdbCursorFuture<'a, T> {
-    pub(crate) fn new(
-        req: Result<web_sys::IdbRequest, JsValue>,
-        source: &'a T,
-    ) -> Result<Self, DomException> {
-        let request = Rc::new(IdbRequestRef::new(req?));
-        let inner = IdbRequestFuture::new_with_rc(request, true);
-        let req = inner.strong_request();
-
-        Ok(Self { inner, source, req })
-    }
-
-    /// Actual future poll method
-    pub(crate) fn do_poll(
-        &self,
-        ctx: &Context<'_>,
-    ) -> Poll<Result<Option<IdbCursor<'a, T>>, DomException>> {
-        self.inner.do_poll(ctx).map(|res| self.on_ready(res))
-    }
-
-    fn on_ready(
-        &self,
-        res: Result<Option<JsValue>, DomException>,
-    ) -> Result<Option<IdbCursor<'a, T>>, DomException> {
-        let raw = res?.nightly_unwrap();
-        let opt = if raw.is_null() {
-            None
-        } else {
-            let cur = IdbCursor::new(raw.unchecked_into(), self.source, Rc::clone(&self.req));
-            Some(cur)
-        };
-        Ok(opt)
-    }
-}
-
-impl<'a, T: IdbQuerySource> Future for IdbCursorFuture<'a, T> {
-    type Output = Result<Option<IdbCursor<'a, T>>, DomException>;
-
-    #[inline]
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.do_poll(ctx)
-    }
-}
diff --git a/src/request/futures/cursor/idb_cursor_with_value_future.rs b/src/request/futures/cursor/idb_cursor_with_value_future.rs
deleted file mode 100644
index 053ad43..0000000
--- a/src/request/futures/cursor/idb_cursor_with_value_future.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use fancy_constructor::new;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-use web_sys::DomException;
-
-use crate::idb_cursor::{IdbCursor, IdbCursorWithValue};
-use crate::idb_query_source::IdbQuerySource;
-
-use super::IdbCursorFuture;
-
-/// A [`Future`] that resolves to an [`IdbCursorWithValue`]
-#[derive(Debug, new)]
-#[new(vis(pub(crate)))]
-pub struct IdbCursorWithValueFuture<'a, T: IdbQuerySource>(IdbCursorFuture<'a, T>);
-
-impl<'a, T: IdbQuerySource> IdbCursorWithValueFuture<'a, T> {
-    fn on_ready(
-        res: Result<Option<IdbCursor<'a, T>>, DomException>,
-    ) -> Result<Option<IdbCursorWithValue<'a, T>>, DomException> {
-        Ok(res?.map(IdbCursorWithValue::new))
-    }
-}
-
-impl<'a, T: IdbQuerySource> Future for IdbCursorWithValueFuture<'a, T> {
-    type Output = Result<Option<IdbCursorWithValue<'a, T>>, DomException>;
-
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.0.do_poll(ctx).map(Self::on_ready)
-    }
-}
diff --git a/src/request/futures/cursor/mod.rs b/src/request/futures/cursor/mod.rs
deleted file mode 100644
index eada3f0..0000000
--- a/src/request/futures/cursor/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod idb_cursor_advancement_future;
-mod idb_cursor_future;
-mod idb_cursor_with_value_future;
-
-pub(crate) use idb_cursor_advancement_future::*;
-
-pub use {idb_cursor_future::*, idb_cursor_with_value_future::*};
diff --git a/src/request/futures/idb_open_db_request_future.rs b/src/request/futures/idb_open_db_request_future.rs
deleted file mode 100644
index f3c9230..0000000
--- a/src/request/futures/idb_open_db_request_future.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use fancy_constructor::new;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-use super::{super::OpenDbRequestListeners, IdbRequestFuture};
-
-/// Base `IdbOpenDbRequest` future implementation
-#[derive(Debug, new)]
-#[new(vis(pub(crate)))]
-pub struct IdbOpenDbRequestFuture {
-    base: IdbRequestFuture,
-    _listeners: OpenDbRequestListeners,
-}
-
-impl Future for IdbOpenDbRequestFuture {
-    type Output = Result<Option<JsValue>, DomException>;
-
-    #[inline]
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.base.do_poll(ctx)
-    }
-}
diff --git a/src/request/futures/idb_request_future.rs b/src/request/futures/idb_request_future.rs
deleted file mode 100644
index 8c6209b..0000000
--- a/src/request/futures/idb_request_future.rs
+++ /dev/null
@@ -1,144 +0,0 @@
-use std::cell::RefCell;
-use std::future::Future;
-use std::pin::Pin;
-use std::rc::{Rc, Weak};
-use std::task::{Context, Poll, Waker};
-
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{DomException, IdbRequestReadyState};
-
-use crate::internal_utils::{create_lazy_ref_cell, wake, NightlyUnwrap};
-
-use super::super::IdbRequestRef;
-
-type WakerRef = Rc<RefCell<Option<Waker>>>;
-type ResultRef = Rc<RefCell<Option<OutputResult>>>;
-type OutputResult = Result<Option<JsValue>, DomException>;
-type Cb = Closure<dyn Fn() + 'static>;
-
-/// Base `IdbRequest` future implementation
-#[derive(Debug)]
-pub struct IdbRequestFuture {
-    request: Rc<IdbRequestRef>,
-    result: ResultRef,
-    waker: WakerRef,
-    _on_success: Option<Cb>,
-    on_error: Option<Cb>,
-}
-
-impl IdbRequestFuture {
-    pub(crate) fn new_with_rc(request: Rc<IdbRequestRef>, read_response: bool) -> Self {
-        let waker = create_lazy_ref_cell();
-        let result;
-
-        let on_success;
-        let on_error;
-
-        // Just set the result if the request has already finished
-        if let IdbRequestReadyState::Done = request.inner().ready_state() {
-            on_success = None;
-            on_error = None;
-            let res = extract_success_result(&request, read_response);
-            result = Rc::new(RefCell::new(Some(res)));
-        } else {
-            // Else set error+success listeners
-            result = create_lazy_ref_cell();
-            let on_success_cb = create_success_closure(
-                waker.clone(),
-                result.clone(),
-                request.clone(),
-                read_response,
-            );
-            let on_error_cb = create_error_closure(waker.clone(), result.clone(), request.clone());
-
-            request
-                .inner()
-                .set_onsuccess(Some(on_success_cb.as_ref().unchecked_ref()));
-            request
-                .inner()
-                .set_onerror(Some(on_error_cb.as_ref().unchecked_ref()));
-
-            on_success = Some(on_success_cb);
-            on_error = Some(on_error_cb);
-        }
-
-        Self {
-            request,
-            result,
-            waker,
-            _on_success: on_success,
-            on_error,
-        }
-    }
-
-    /// Obtain a weak reference to the request
-    #[inline]
-    pub(crate) fn weak_request(&self) -> Weak<IdbRequestRef> {
-        Rc::downgrade(&self.request)
-    }
-
-    /// Obtain a strong reference to the request
-    #[inline]
-    #[cfg(feature = "cursors")]
-    pub(crate) fn strong_request(&self) -> Rc<IdbRequestRef> {
-        self.request.clone()
-    }
-
-    /// Actual [Future] polling function
-    pub(crate) fn do_poll(&self, ctx: &Context<'_>) -> Poll<OutputResult> {
-        if self.result.borrow().is_some() {
-            let result = self.result.replace(None).nightly_unwrap();
-            Poll::Ready(result)
-        } else {
-            RefCell::borrow_mut(&self.waker).replace(ctx.waker().clone());
-            Poll::Pending
-        }
-    }
-}
-
-impl Future for IdbRequestFuture {
-    type Output = OutputResult;
-
-    #[inline]
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.do_poll(ctx)
-    }
-}
-
-impl Drop for IdbRequestFuture {
-    fn drop(&mut self) {
-        if self.on_error.is_some() {
-            self.request.inner().set_onerror(None);
-            self.request.inner().set_onsuccess(None);
-        }
-    }
-}
-
-/// Extract the request result. The Ok result will be `Some` if `read` is true and `None` if it's
-/// false
-fn extract_success_result(request: &IdbRequestRef, read: bool) -> OutputResult {
-    Ok(if read { Some(request.result()?) } else { None })
-}
-
-/// Create `on_success` callback
-fn create_success_closure(
-    waker: WakerRef,
-    result: ResultRef,
-    request: Rc<IdbRequestRef>,
-    read: bool,
-) -> Cb {
-    let b = Box::new(move || {
-        result.replace(Some(extract_success_result(&request, read)));
-        wake(&waker);
-    });
-    Closure::wrap(b)
-}
-
-/// Create `on_error` callback
-fn create_error_closure(waker: WakerRef, result: ResultRef, request: Rc<IdbRequestRef>) -> Cb {
-    let b = Box::new(move || {
-        result.replace(Some(Err(request.error().expect("Failed to unwrap error"))));
-        wake(&waker);
-    });
-    Closure::wrap(b)
-}
diff --git a/src/request/futures/jscast_request_future.rs b/src/request/futures/jscast_request_future.rs
deleted file mode 100644
index 6959f37..0000000
--- a/src/request/futures/jscast_request_future.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use std::future::{Future, IntoFuture};
-use std::marker::PhantomData;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::DomException;
-
-use crate::internal_utils::NightlyUnwrap;
-
-use super::{super::IdbRequestRef, IdbRequestFuture, ResponseFormattingFuture};
-
-/// A [Future] that casts the `IdbRequest` response to the given type
-#[derive(Debug)]
-pub struct JsCastRequestFuture<T: JsCast> {
-    inner: IdbRequestFuture,
-    _cast: PhantomData<T>,
-}
-
-impl<T: JsCast> JsCastRequestFuture<T> {
-    pub(crate) fn new(req: Result<web_sys::IdbRequest, JsValue>) -> Result<Self, DomException> {
-        let out = Self {
-            inner: IntoFuture::into_future(IdbRequestRef::new(req?)),
-            _cast: PhantomData,
-        };
-        Ok(out)
-    }
-}
-
-impl<T: JsCast> ResponseFormattingFuture<T> for JsCastRequestFuture<T> {
-    fn format_response(v: Result<Option<JsValue>, DomException>) -> Result<T, DomException> {
-        Ok(v?.nightly_unwrap().unchecked_into())
-    }
-
-    #[inline]
-    fn inner(&self) -> &IdbRequestFuture {
-        &self.inner
-    }
-}
-
-impl<T: JsCast> Future for JsCastRequestFuture<T> {
-    type Output = Result<T, DomException>;
-
-    #[inline]
-    fn poll(self: Pin<&mut Self>, ctx: &mut Context<'_>) -> Poll<Self::Output> {
-        self.poll_with_formatting(ctx)
-    }
-}
diff --git a/src/request/futures/map.rs b/src/request/futures/map.rs
deleted file mode 100644
index 757345e..0000000
--- a/src/request/futures/map.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-pub struct MapFuture<Fut, M> {
-    fut: Fut,
-    mapper: M,
-}
-
-impl<Fut, M, O> Future for MapFuture<Fut, M>
-where
-    Fut: Future + Unpin,
-    M: Unpin + Fn(Fut::Output) -> O,
-{
-    type Output = O;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.fut).poll(cx).map(&self.mapper)
-    }
-}
-
-pub(crate) trait TMapFuture: Future {
-    fn map<O, M>(self, mapper: M) -> MapFuture<Self, M>
-    where
-        M: Fn(Self::Output) -> O,
-        Self: Sized;
-}
-
-impl<F: Future> TMapFuture for F {
-    fn map<O, M>(self, mapper: M) -> MapFuture<Self, M>
-    where
-        M: Fn(Self::Output) -> O,
-    {
-        MapFuture { fut: self, mapper }
-    }
-}
diff --git a/src/request/futures/mod.rs b/src/request/futures/mod.rs
deleted file mode 100644
index 2698e47..0000000
--- a/src/request/futures/mod.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-use std::task::{Context, Poll};
-
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-pub use count_future::*;
-pub(crate) use idb_open_db_request_future::*;
-pub(crate) use idb_request_future::*;
-pub use jscast_request_future::*;
-pub(crate) use map::{MapFuture, TMapFuture};
-pub use optional_jsval_future::*;
-pub use void_future::VoidFuture;
-
-macro_rules! impl_result_formatting_struct_commons {
-    ($ty: ident) => {
-        impl $ty {
-            pub(crate) fn new(
-                req: Result<web_sys::IdbRequest, wasm_bindgen::JsValue>,
-            ) -> Result<Self, web_sys::DomException> {
-                let base = $crate::request::IdbRequestRef::new(req?);
-                Ok(Self(::std::future::IntoFuture::into_future(base)))
-            }
-        }
-    };
-}
-
-macro_rules! impl_result_formatting_future_future {
-    ($for: ty, $rsp: ty) => {
-        impl std::future::Future for $for {
-            type Output = Result<$rsp, DomException>;
-
-            #[inline]
-            fn poll(
-                self: Pin<&mut Self>,
-                ctx: &mut std::task::Context,
-            ) -> std::task::Poll<Self::Output> {
-                self.poll_with_formatting(ctx)
-            }
-        }
-    };
-}
-
-mod count_future;
-mod idb_open_db_request_future;
-mod idb_request_future;
-mod jscast_request_future;
-mod map;
-mod optional_jsval_future;
-mod void_future;
-
-#[cfg(feature = "cursors")]
-mod cursor;
-
-#[cfg(feature = "cursors")]
-pub use cursor::*;
-
-trait ResponseFormattingFuture<T> {
-    /// Format the raw response into what the implementing struct expects
-    fn format_response(v: Result<Option<JsValue>, DomException>) -> Result<T, DomException>;
-
-    fn inner(&self) -> &IdbRequestFuture;
-
-    /// Poll the inner future and format the ready response
-    fn poll_with_formatting(&self, ctx: &Context<'_>) -> Poll<Result<T, DomException>> {
-        self.inner().do_poll(ctx).map(Self::format_response)
-    }
-}
diff --git a/src/request/futures/optional_jsval_future.rs b/src/request/futures/optional_jsval_future.rs
deleted file mode 100644
index 206e1a6..0000000
--- a/src/request/futures/optional_jsval_future.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use std::pin::Pin;
-
-use delegate_display::DelegateDebug;
-use wasm_bindgen::prelude::*;
-use web_sys::DomException;
-
-use crate::internal_utils::{optional_jsvalue_undefined, NightlyUnwrap};
-
-use super::{IdbRequestFuture, ResponseFormattingFuture};
-
-/// A [`Future`](std::future::Future) that resolves to `None` if the result is `undefined`
-#[derive(DelegateDebug)]
-pub struct OptionalJsValueFuture(IdbRequestFuture);
-impl_result_formatting_struct_commons!(OptionalJsValueFuture);
-
-impl ResponseFormattingFuture<Option<JsValue>> for OptionalJsValueFuture {
-    fn format_response(
-        v: Result<Option<JsValue>, DomException>,
-    ) -> Result<Option<JsValue>, DomException> {
-        Ok(optional_jsvalue_undefined(v?.nightly_unwrap()))
-    }
-
-    #[inline]
-    fn inner(&self) -> &IdbRequestFuture {
-        &self.0
-    }
-}
-
-impl_result_formatting_future_future!(OptionalJsValueFuture, Option<JsValue>);
diff --git a/src/request/futures/void_future.rs b/src/request/futures/void_future.rs
deleted file mode 100644
index 31a131b..0000000
--- a/src/request/futures/void_future.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use fancy_constructor::new;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
-
-/// A future that drops the non-error part of a `Result`
-#[derive(new)]
-#[new(vis(pub(crate)))]
-pub struct VoidFuture<F>(F);
-
-impl<F, S, E> Future for VoidFuture<F>
-where
-    F: Future<Output = Result<S, E>> + Unpin,
-{
-    type Output = Result<(), E>;
-
-    fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        Pin::new(&mut self.0).poll(cx).map(move |_| Ok(()))
-    }
-}
diff --git a/src/request/idb_open_db_request_ref.rs b/src/request/idb_open_db_request_ref.rs
deleted file mode 100644
index 33f6892..0000000
--- a/src/request/idb_open_db_request_ref.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-use std::future::{Future, IntoFuture};
-use std::ops::{Deref, DerefMut};
-use std::rc::{Rc, Weak};
-
-use fancy_constructor::new;
-use wasm_bindgen::{prelude::*, JsCast};
-
-use crate::idb_database::{IdbVersionChangeCallback, IdbVersionChangeEvent};
-use crate::internal_utils::NightlyUnwrap;
-
-use super::{IdbOpenDbRequestFuture, IdbRequestRef};
-
-#[derive(Debug, new)]
-pub(crate) struct OpenDbRequestListeners {
-    request: Weak<IdbRequestRef>,
-
-    #[new(default)]
-    on_blocked: Option<IdbVersionChangeCallback>,
-
-    #[new(default)]
-    on_upgrade_needed: Option<IdbVersionChangeCallback>,
-}
-
-impl OpenDbRequestListeners {
-    pub fn set_on_upgrade_needed<F>(&mut self, callback: Option<F>)
-    where
-        F: Fn(&IdbVersionChangeEvent) -> Result<(), JsValue> + 'static,
-    {
-        let base = self.request.upgrade().nightly_unwrap();
-        let req = base.inner_as_idb_request();
-        self.on_upgrade_needed = if let Some(callback) = callback {
-            let callback = IdbVersionChangeEvent::wrap_callback(callback);
-            req.set_onupgradeneeded(Some(callback.as_ref().unchecked_ref()));
-            Some(callback)
-        } else {
-            req.set_onupgradeneeded(None);
-            None
-        };
-    }
-
-    pub fn set_on_blocked<F>(&mut self, callback: Option<F>)
-    where
-        F: Fn(&IdbVersionChangeEvent) -> Result<(), JsValue> + 'static,
-    {
-        let base = self.request.upgrade().nightly_unwrap();
-        let req = base.inner_as_idb_request();
-        self.on_blocked = if let Some(callback) = callback {
-            let callback = IdbVersionChangeEvent::wrap_callback(callback);
-            req.set_onblocked(Some(callback.as_ref().unchecked_ref()));
-            Some(callback)
-        } else {
-            req.set_onblocked(None);
-            None
-        };
-    }
-
-    fn run_drop(&self, has_upgrade_needed: bool, has_blocked: bool) {
-        if let Some(req) = self.request.upgrade() {
-            let cast_req = req.inner_as_idb_request();
-            if has_upgrade_needed {
-                cast_req.set_onupgradeneeded(None);
-            }
-            if has_blocked {
-                cast_req.set_onblocked(None);
-            }
-        }
-    }
-}
-
-impl Drop for OpenDbRequestListeners {
-    fn drop(&mut self) {
-        let has_upgrade_needed = self.on_upgrade_needed.is_some();
-        let has_blocked = self.on_blocked.is_some();
-
-        if has_upgrade_needed || has_blocked {
-            self.run_drop(has_upgrade_needed, has_blocked);
-        }
-    }
-}
-
-#[derive(Debug)]
-pub(crate) struct IdbOpenDbRequestRef {
-    base: Rc<IdbRequestRef>,
-    listeners: OpenDbRequestListeners,
-}
-
-impl IdbOpenDbRequestRef {
-    pub fn new(inner: web_sys::IdbOpenDbRequest) -> Self {
-        let base = Rc::new(IdbRequestRef::new(inner.unchecked_into()));
-        let listeners = OpenDbRequestListeners::new(Rc::downgrade(&base));
-
-        Self { base, listeners }
-    }
-
-    pub(crate) fn into_future(self, read_response: bool) -> IdbOpenDbRequestFuture {
-        // We need to take the request out of the Rc to turn it into a future
-        let base = Rc::try_unwrap(self.base)
-            .nightly_unwrap()
-            .into_future(read_response);
-
-        // Then we need to re-set the new weak ref
-        let mut listeners = self.listeners;
-        listeners.request = base.weak_request();
-
-        IdbOpenDbRequestFuture::new(base, listeners)
-    }
-}
-
-impl IntoFuture for IdbOpenDbRequestRef {
-    type Output = <IdbOpenDbRequestFuture as Future>::Output;
-    type IntoFuture = IdbOpenDbRequestFuture;
-
-    fn into_future(self) -> Self::IntoFuture {
-        self.into_future(true)
-    }
-}
-
-impl Deref for IdbOpenDbRequestRef {
-    type Target = OpenDbRequestListeners;
-
-    #[inline]
-    fn deref(&self) -> &Self::Target {
-        &self.listeners
-    }
-}
-
-impl DerefMut for IdbOpenDbRequestRef {
-    #[inline]
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.listeners
-    }
-}
diff --git a/src/request/idb_request_ref.rs b/src/request/idb_request_ref.rs
deleted file mode 100644
index 0e7a6a3..0000000
--- a/src/request/idb_request_ref.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::future::{Future, IntoFuture};
-use std::rc::Rc;
-
-use accessory::Accessors;
-use fancy_constructor::new;
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::DomException;
-
-use super::IdbRequestFuture;
-
-#[derive(Debug, new, Accessors)]
-pub(crate) struct IdbRequestRef {
-    #[access(get)]
-    inner: web_sys::IdbRequest,
-}
-
-impl IdbRequestRef {
-    #[inline]
-    pub fn inner_as_idb_request(&self) -> &web_sys::IdbOpenDbRequest {
-        self.inner().unchecked_ref()
-    }
-
-    pub fn result(&self) -> Result<JsValue, DomException> {
-        match self.inner().result() {
-            Ok(v) => Ok(v),
-            Err(fallback) => self.error_with_fallback(fallback),
-        }
-    }
-
-    pub fn error(&self) -> Option<DomException> {
-        self.inner().error().ok()?
-    }
-
-    fn error_with_fallback(&self, fallback: JsValue) -> Result<JsValue, DomException> {
-        Err(self
-            .error()
-            .unwrap_or_else(move || fallback.unchecked_into()))
-    }
-
-    #[inline]
-    pub fn rc_to_future(self_rc: Rc<Self>, read_response: bool) -> IdbRequestFuture {
-        IdbRequestFuture::new_with_rc(self_rc, read_response)
-    }
-
-    #[inline]
-    pub(crate) fn into_future(self, read_response: bool) -> IdbRequestFuture {
-        Self::rc_to_future(Rc::new(self), read_response)
-    }
-}
-
-impl IntoFuture for IdbRequestRef {
-    type Output = <IdbRequestFuture as Future>::Output;
-    type IntoFuture = IdbRequestFuture;
-
-    #[inline]
-    fn into_future(self) -> Self::IntoFuture {
-        Self::rc_to_future(Rc::new(self), true)
-    }
-}
diff --git a/src/request/mod.rs b/src/request/mod.rs
deleted file mode 100644
index 2e005cd..0000000
--- a/src/request/mod.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-//! IDB requests and futures
-
-pub use futures::*;
-use idb_open_db_request_ref::*;
-pub(crate) use idb_request_ref::*;
-pub use open_db_request::*;
-pub use request_like::*;
-pub use void_open_db_request::*;
-pub use void_request::*;
-
-macro_rules! impl_void_request {
-    (for $for: ty, raw $raw_ty: ty, ref $ref_ty: ty, fut $fut: ty) => {
-        impl $for {
-            #[inline]
-            pub(crate) fn new(req: $raw_ty) -> Self {
-                Self(<$ref_ty>::new(req))
-            }
-        }
-
-        impl ::std::future::IntoFuture for $for {
-            type Output = Result<(), ::web_sys::DomException>;
-            type IntoFuture = $crate::request::futures::VoidFuture<$fut>;
-
-            /// Turn the request into a future. This is when event listeners get set.
-            fn into_future(self) -> Self::IntoFuture {
-                let inner = self.0.into_future(false);
-                $crate::request::futures::VoidFuture::new(inner)
-            }
-        }
-    };
-}
-
-macro_rules! impl_idb_open_request_like {
-    ($for: ty) => {
-        impl crate::request::IdbOpenDbRequestLike for $for {
-            #[inline]
-            fn set_on_upgrade_needed<F>(&mut self, callback: Option<F>)
-            where
-                F: Fn(
-                        &crate::idb_database::IdbVersionChangeEvent,
-                    ) -> Result<(), wasm_bindgen::JsValue>
-                    + 'static,
-            {
-                self.0.set_on_upgrade_needed(callback);
-            }
-
-            #[inline]
-            fn set_on_blocked<F>(&mut self, callback: Option<F>)
-            where
-                F: Fn(
-                        &crate::idb_database::IdbVersionChangeEvent,
-                    ) -> Result<(), wasm_bindgen::JsValue>
-                    + 'static,
-            {
-                self.0.set_on_blocked(callback);
-            }
-        }
-    };
-}
-
-mod idb_open_db_request_ref;
-mod idb_request_ref;
-mod open_db_request;
-mod request_like;
-mod void_open_db_request;
-mod void_request;
-
-mod futures;
diff --git a/src/request/open_db_request.rs b/src/request/open_db_request.rs
deleted file mode 100644
index e395cc0..0000000
--- a/src/request/open_db_request.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use std::future::IntoFuture;
-
-use wasm_bindgen::{JsCast, JsValue};
-use web_sys::DomException;
-
-use crate::idb_database::IdbDatabase;
-use crate::internal_utils::NightlyUnwrap;
-
-use super::futures::{MapFuture, TMapFuture};
-use super::{IdbOpenDbRequestFuture, IdbOpenDbRequestRef};
-
-/// Request for opening an [`IdbDatabase`]
-#[derive(Debug)]
-pub struct OpenDbRequest(IdbOpenDbRequestRef);
-
-type FutFn = fn(Result<Option<JsValue>, DomException>) -> Result<IdbDatabase, DomException>;
-
-impl OpenDbRequest {
-    #[inline]
-    pub(crate) fn new(req: web_sys::IdbOpenDbRequest) -> Self {
-        Self(IdbOpenDbRequestRef::new(req))
-    }
-
-    fn instantiate(
-        raw: Result<Option<JsValue>, DomException>,
-    ) -> Result<IdbDatabase, DomException> {
-        Ok(IdbDatabase::new(raw?.nightly_unwrap().unchecked_into()))
-    }
-}
-
-impl IntoFuture for OpenDbRequest {
-    type Output = Result<IdbDatabase, DomException>;
-    type IntoFuture = MapFuture<IdbOpenDbRequestFuture, FutFn>;
-
-    /// Turn the request into a future. This is when event listeners get set.
-    fn into_future(self) -> Self::IntoFuture {
-        IntoFuture::into_future(self.0).map::<_, FutFn>(Self::instantiate)
-    }
-}
-
-impl_idb_open_request_like!(OpenDbRequest);
diff --git a/src/request/request_like.rs b/src/request/request_like.rs
deleted file mode 100644
index bef67fb..0000000
--- a/src/request/request_like.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use wasm_bindgen::prelude::*;
-
-use crate::idb_database::IdbVersionChangeEvent;
-
-/// Common trait for `IdbOpenDbRequest`s
-pub trait IdbOpenDbRequestLike {
-    /// Set the callback for the `upgradeneeded` event
-    fn set_on_upgrade_needed<F>(&mut self, callback: Option<F>)
-    where
-        F: Fn(&IdbVersionChangeEvent) -> Result<(), JsValue> + 'static;
-
-    /// Set the callback for the `blocked` event
-    fn set_on_blocked<F>(&mut self, callback: Option<F>)
-    where
-        F: Fn(&IdbVersionChangeEvent) -> Result<(), JsValue> + 'static;
-}
diff --git a/src/request/void_open_db_request.rs b/src/request/void_open_db_request.rs
deleted file mode 100644
index 05b0af8..0000000
--- a/src/request/void_open_db_request.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use super::IdbOpenDbRequestRef;
-
-/// An [`OpenDbRequest`](super::OpenDbRequest) that resolves to ()
-#[derive(Debug)]
-pub struct VoidOpenDbRequest(IdbOpenDbRequestRef);
-
-impl_void_request!(
-    for VoidOpenDbRequest,
-    raw web_sys::IdbOpenDbRequest,
-    ref IdbOpenDbRequestRef,
-    fut super::futures::IdbOpenDbRequestFuture
-);
-impl_idb_open_request_like!(VoidOpenDbRequest);
diff --git a/src/request/void_request.rs b/src/request/void_request.rs
deleted file mode 100644
index 108e949..0000000
--- a/src/request/void_request.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-use super::IdbRequestRef;
-
-/// An request that resolves to ()
-#[derive(Debug)]
-pub struct VoidRequest(IdbRequestRef);
-
-impl_void_request!(
-    for VoidRequest,
-    raw web_sys::IdbRequest,
-    ref IdbRequestRef,
-    fut super::futures::IdbRequestFuture
-);
diff --git a/src/serde.rs b/src/serde.rs
new file mode 100644
index 0000000..cdfc5ef
--- /dev/null
+++ b/src/serde.rs
@@ -0,0 +1,35 @@
+//! Serde-specific utilities
+
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use wasm_bindgen::prelude::*;
+
+/// A type that's convertible to [`JsValue`] using `serde`, but not necessarily
+/// [`serialisable`](serde::Serialize) as a whole.
+pub trait SerialiseToJs {
+    /// Convert the type to a [`JsValue`], most likely using [`serde_wasm_bindgen`].
+    #[allow(clippy::missing_errors_doc)]
+    fn serialise_to_js(&self) -> crate::Result<JsValue>;
+}
+
+/// A type that's convertible from [`JsValue`] using `serde`, but not necessarily
+/// [`deserialisable`](serde::Deserialize) as a whole.
+pub trait DeserialiseFromJs {
+    /// Deserialise a value from JS, most likely using [`serde_wasm_bindgen`].
+    #[allow(clippy::missing_errors_doc)]
+    fn deserialise_from_js(js: JsValue) -> crate::Result<Self>
+    where
+        Self: Sized;
+}
+
+impl<T: Serialize> SerialiseToJs for T {
+    fn serialise_to_js(&self) -> crate::Result<JsValue> {
+        serde_wasm_bindgen::to_value(self).map_err(Into::into)
+    }
+}
+
+impl<T: DeserializeOwned> DeserialiseFromJs for T {
+    fn deserialise_from_js(js: JsValue) -> crate::Result<Self> {
+        serde_wasm_bindgen::from_value(js).map_err(Into::into)
+    }
+}
diff --git a/src/transaction.rs b/src/transaction.rs
new file mode 100644
index 0000000..a3a3913
--- /dev/null
+++ b/src/transaction.rs
@@ -0,0 +1,162 @@
+//! An [`IDBTransaction`](https://developer.mozilla.org/en-US/docs/Web/API/IDBTransaction) implementation.
+
+use crate::database::Database;
+use crate::error::Error;
+use crate::internal_utils::{StructName, SystemRepr};
+use crate::iter::DomStringIter;
+use crate::object_store::ObjectStore;
+use accessory::Accessors;
+use internal_macros::errdoc;
+use listeners::TxListeners;
+pub(crate) use options::TransactionOptionsSys;
+pub use options::{TransactionDurability, TransactionOptions};
+use std::fmt::{Debug, Formatter};
+pub(crate) use tx_sys::TransactionSys;
+pub use web_sys::IdbTransactionMode as TransactionMode;
+
+mod listeners;
+mod options;
+mod tx_sys;
+
+/// An [`IDBTransaction`](https://developer.mozilla.org/en-US/docs/Web/API/IDBTransaction) implementation.
+///
+/// Unlike JS transactions, **this defaults to aborting the transaction instead of committing it** -
+/// the opposite of the default behaviour in JS. Dropping the transaction without calling
+/// [`commit`](Transaction::commit) will act the same as calling
+/// [`abort`](Transaction::abort) - see browser compatibility note on the `abort` fn for caveats.
+#[derive(Accessors, StructName)]
+#[must_use]
+pub struct Transaction<'a> {
+    listeners: TxListeners,
+
+    /// Reference to the database associated with the transaction.
+    #[access(get(cp))]
+    db: &'a Database,
+
+    done: bool,
+}
+
+/// A [transaction's](Transaction) result.
+#[derive(Debug, PartialEq, derive_more::From)]
+enum TransactionResult {
+    /// Transaction committed successfully.
+    Ok,
+
+    /// Transaction errored.
+    Err(Error),
+
+    /// Transaction aborted.
+    Abort,
+}
+
+macro_rules! map_result {
+    ($expr: expr, ok: $ok: ident, unexpected: $unexpect: ident => $err: ident) => {
+        match $expr {
+            TransactionResult::$ok => Ok(()),
+            TransactionResult::Err(e) => Err(e),
+            TransactionResult::$unexpect => Err(crate::error::UnexpectedDataError::$err.into()),
+        }
+    };
+}
+
+impl<'a> Transaction<'a> {
+    pub(crate) fn new(db: &'a Database, inner: web_sys::IdbTransaction) -> Self {
+        Self {
+            listeners: TxListeners::new(inner),
+            db,
+            done: false,
+        }
+    }
+
+    /// Get an iterator of the names of [`IdbObjectStore`](ObjectStore) objects
+    /// associated with the transaction.
+    pub fn object_store_names(&self) -> DomStringIter {
+        DomStringIter::new(self.as_sys().object_store_names())
+    }
+
+    /// Get an object store that's part of the transaction.
+    #[errdoc(Transaction(NotFoundError, InvalidStateError))]
+    #[allow(clippy::missing_errors_doc)]
+    pub fn object_store(&self, name: &str) -> crate::Result<ObjectStore> {
+        match self.as_sys().object_store(name) {
+            Ok(store) => Ok(ObjectStore::from_tx(store, self)),
+            Err(e) => Err(e.into()),
+        }
+    }
+
+    /// The mode for isolating access to data in the object stores that are in the scope of the
+    /// transaction.
+    #[must_use]
+    pub fn mode(&self) -> TransactionMode {
+        self.as_sys().mode().unwrap_or(TransactionMode::Readonly)
+    }
+
+    /// # Returns
+    /// `None` if the transaction is not finished, is finished and successfully committed,
+    /// or was aborted with `abort()` function.
+    #[must_use]
+    pub fn error(&self) -> Option<Error> {
+        self.as_sys().error().map(Into::into)
+    }
+
+    /// Rolls back all the changes to objects in the database associated with this transaction.
+    ///
+    /// # Browser compatibility note
+    ///
+    /// Note that, depending on the browser, the this function may or may not roll back requests that have already been
+    /// `await`ed. Chrome & Firefox, for example, appear to roll back `await`ed requests, while Safari only rolls back
+    /// requests that have been built ([primitive](crate::BuildPrimitive) | [serde](crate::BuildSerde)), but not
+    /// `await`ed.
+    #[allow(clippy::missing_errors_doc)]
+    pub async fn abort(mut self) -> crate::Result<()> {
+        self.done = true;
+        self.as_sys().abort()?;
+
+        map_result!(self.listeners.recv().await, ok: Abort, unexpected: Ok => TransactionCommitted)
+    }
+
+    /// Commits all the changes made to objects in the database associated with this transaction.
+    #[allow(clippy::missing_errors_doc)]
+    pub async fn commit(mut self) -> crate::Result<()> {
+        self.done = true;
+        self.as_sys().do_commit()?;
+
+        map_result!(self.listeners.recv().await, ok: Ok, unexpected: Abort => TransactionAborted)
+    }
+}
+
+#[::sealed::sealed]
+#[allow(unused_qualifications)]
+impl crate::internal_utils::SystemRepr for Transaction<'_> {
+    type Repr = TransactionSys;
+
+    #[inline]
+    fn as_sys(&self) -> &Self::Repr {
+        self.listeners.transaction()
+    }
+
+    #[inline]
+    fn into_sys(self) -> Self::Repr {
+        self.as_sys().clone()
+    }
+}
+
+impl Drop for Transaction<'_> {
+    fn drop(&mut self) {
+        self.listeners.free_listeners();
+
+        if !self.done {
+            let _ = self.as_sys().abort();
+        }
+    }
+}
+
+impl Debug for Transaction<'_> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct(Self::TYPE_NAME)
+            .field("transaction", self.as_sys())
+            .field("db", self.db())
+            .field("done", &self.done)
+            .finish()
+    }
+}
diff --git a/src/transaction/listeners.rs b/src/transaction/listeners.rs
new file mode 100644
index 0000000..9167864
--- /dev/null
+++ b/src/transaction/listeners.rs
@@ -0,0 +1,98 @@
+use super::{TransactionResult, TransactionSys};
+use crate::error::{DomException, SimpleValueError, UnexpectedDataError};
+use accessory::Accessors;
+use tokio::sync::mpsc;
+use wasm_bindgen::prelude::*;
+
+type Cb = dyn FnMut() + 'static;
+type ErrCb = dyn FnMut(web_sys::Event) + 'static;
+
+#[derive(Accessors)]
+#[access(defaults(all(vis(pub(super)))))]
+pub(super) struct TxListeners {
+    #[access(get, get_mut)]
+    transaction: TransactionSys,
+    closures: Closures,
+}
+
+pub(super) struct Closures {
+    rx: mpsc::UnboundedReceiver<TransactionResult>,
+    _on_success: Closure<Cb>,
+    _on_abort: Closure<Cb>,
+    _on_error: Closure<ErrCb>,
+}
+
+impl TxListeners {
+    pub(super) fn new(transaction: web_sys::IdbTransaction) -> Self {
+        Self {
+            closures: Closures::new(&transaction),
+            transaction: transaction.unchecked_into(),
+        }
+    }
+
+    pub(super) async fn recv(&mut self) -> TransactionResult {
+        if let Some(res) = self.closures.rx.recv().await {
+            res
+        } else {
+            unreachable!("Transaction listener channel closed");
+        }
+    }
+
+    pub(super) fn free_listeners(&self) {
+        self.transaction.set_onerror(None);
+        self.transaction.set_oncomplete(None);
+        self.transaction.set_onabort(None);
+    }
+}
+
+impl Closures {
+    fn new(transaction: &web_sys::IdbTransaction) -> Self {
+        let (tx, rx) = mpsc::unbounded_channel();
+
+        let on_success = Closure::once({
+            let tx = tx.clone();
+            move || {
+                let _ = tx.send(TransactionResult::Ok);
+            }
+        });
+        let on_abort = Closure::once({
+            let tx = tx.clone();
+            move || {
+                let _ = tx.send(TransactionResult::Abort);
+            }
+        });
+        let on_error = Closure::once(move |evt: web_sys::Event| {
+            let _ = tx.send(TransactionResult::Err(match evt.target() {
+                Some(target) => match target.dyn_into::<web_sys::IdbRequest>() {
+                    Ok(req) => match req.error() {
+                        Ok(Some(e)) => {
+                            let e = DomException::from(e);
+                            match e {
+                                DomException::AbortError(_) => {
+                                    let _ = tx.send(TransactionResult::Abort);
+                                    return;
+                                }
+                                e => e.into(),
+                            }
+                        }
+                        Ok(None) => UnexpectedDataError::NoErrorFound.into(),
+                        Err(e) => e.into(),
+                    },
+                    Err(js) => SimpleValueError::DynCast(js.unchecked_into()).into(),
+                },
+                None => UnexpectedDataError::NoEventTarget.into(),
+            }));
+        });
+
+        transaction.set_onerror(Some(on_error.as_ref().unchecked_ref()));
+        transaction.set_oncomplete(Some(on_success.as_ref().unchecked_ref()));
+        transaction.set_onabort(Some(on_abort.as_ref().unchecked_ref()));
+
+        Self {
+            rx,
+            _on_success: on_success,
+            _on_abort: on_abort,
+            _on_error: on_error,
+        }
+    }
+}
diff --git a/src/transaction/options.rs b/src/transaction/options.rs
new file mode 100644
index 0000000..9ca80ca
--- /dev/null
+++ b/src/transaction/options.rs
@@ -0,0 +1,108 @@
+use accessory::Accessors;
+use fancy_constructor::new;
+use wasm_bindgen::prelude::*;
+
+pub use durability::TransactionDurability;
+use internal_macros::generate_with;
+
+use crate::error::Error;
+
+/// Options to pass to
+/// [`TransactionBuilder::with_options`](crate::database::TransactionBuilder::with_options).
+#[derive(new, Accessors, Debug, Clone, PartialEq)]
+pub struct TransactionOptions {
+    /// See docs of individual [`TransactionDurability`] variants.
+    #[access(get(cp))]
+    #[new(val(None))]
+    durability: Option<TransactionDurability>,
+}
+
+impl TransactionOptions {
+    /// Set the durability of the transaction
+    #[generate_with]
+    #[inline]
+    pub fn set_durability(&mut self, durability: TransactionDurability) -> &mut Self {
+        self.durability = Some(durability);
+        self
+    }
+}
+
+impl TransactionDurability {
+    /// String representation of the durability
+    #[must_use]
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Strict => "strict",
+            Self::Relaxed => "relaxed",
+            _ => "default",
+        }
+    }
+}
+
+impl AsRef<str> for TransactionDurability {
+    #[inline]
+    fn as_ref(&self) -> &str {
+        self.as_str()
+    }
+}
+
+impl TryFrom<TransactionOptions> for TransactionOptionsSys {
+    type Error = Error;
+
+    fn try_from(this: TransactionOptions) -> Result<Self, Self::Error> {
+        let opts = TransactionOptionsSys::new();
+
+        if let Some(durability) = this.durability {
+            opts.with_durability(durability).map_err(Into::into)
+        } else {
+            Ok(opts)
+        }
+    }
+}
+
+impl TransactionOptionsSys {
+    pub(super) fn new() -> Self {
+        js_sys::Object::new().unchecked_into()
+    }
+
+    pub(super) fn with_durability(
+        self,
+        durability: TransactionDurability,
+    ) -> Result<Self, JsValue> {
+        js_sys::Reflect::set(self.as_ref(), &"durability".into(), &durability.into())?;
+        Ok(self)
+    }
+}
+
+#[allow(missing_docs)]
+mod durability {
+    use wasm_bindgen::prelude::*;
+
+    /// Transaction durability option
+    #[wasm_bindgen]
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    pub enum TransactionDurability {
+        /// The user agent may consider that the transaction has successfully committed only after verifying that all
+        /// outstanding changes have been successfully written to a persistent storage medium. This is recommended where
+        /// the risk of data loss outweighs the impact of its use on performance and power
+        /// (compared to [`relaxed`](crate::database::tx_opts::IdbTransactionDurability::Relaxed)).
+        Strict = "strict",
+
+        /// The user agent may consider that the transaction has successfully committed as soon as all outstanding changes
+        /// have been written to the operating system, without subsequent verification. This offers better performance
+        /// than [`strict`](crate::database::tx_opts::IdbTransactionDurability::Strict), and is recommended for ephemeral
+        /// data such as caches or quickly changing records.
+        Relaxed = "relaxed",
+
+        /// The user agent should use its default durability behavior for the storage bucket.
+        /// This is the default for transactions if not otherwise specified.
+        Default = "default",
+    }
+}
+
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen]
+    #[wasm_bindgen(extends = js_sys::Object)]
+    pub type TransactionOptionsSys;
+}
diff --git a/src/transaction/tx_sys.rs b/src/transaction/tx_sys.rs
new file mode 100644
index 0000000..266eb43
--- /dev/null
+++ b/src/transaction/tx_sys.rs
@@ -0,0 +1,11 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+extern "C" {
+    #[wasm_bindgen(extends = web_sys::IdbTransaction, js_name = IDBTransaction)]
+    #[derive(Clone, Debug)]
+    pub type TransactionSys;
+
+    #[wasm_bindgen(catch, method, structural, js_class="IDBTransaction", js_name=commit)]
+    pub(crate) fn do_commit(this: &TransactionSys) -> Result<(), JsValue>;
+}
diff --git a/src/typed_array.rs b/src/typed_array.rs
new file mode 100644
index 0000000..499db0a
--- /dev/null
+++ b/src/typed_array.rs
@@ -0,0 +1,208 @@
+//! Partial
+//! [`TypedArray`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray)
+//! implementations. Currently only aims to offer convenient conversion to/from [`Vec`].
+
+use fancy_constructor::new;
+use std::iter::Copied;
+use std::ops::Deref;
+use wasm_bindgen::prelude::*;
+
+/// A partial
+/// [`TypedArray`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/TypedArray)
+/// implementation.
+///
+/// Currently only aims to offer convenient conversion to/from [`Vec`].
+#[derive(
+    new,
+    Debug,
+    Ord,
+    PartialOrd,
+    Eq,
+    PartialEq,
+    Hash,
+    Clone,
+    derive_more::Deref,
+    derive_more::DerefMut,
+    derive_more::Into,
+)]
+pub struct TypedArray<T>(#[new(name(source), into)] Vec<T>);
+
+/// A [`TypedArray`] slice. Exists for performing [`TryToJs`](crate::primitive::TryToJs) conversions on borrowed data.
+#[derive(
+    new, Debug, Ord, PartialOrd, Eq, PartialEq, Hash, derive_more::Into, derive_more::From,
+)]
+pub struct TypedArraySlice<'a, T>(#[new(name(source))] &'a [T]);
+
+impl<T> TypedArray<T> {
+    /// Convert this [`TypedArray`] into a [`TypedArraySlice`].
+    #[must_use]
+    pub fn as_slice(&self) -> TypedArraySlice<T> {
+        TypedArraySlice::new(&self.0)
+    }
+}
+
+impl<T> Clone for TypedArraySlice<'_, T> {
+    #[inline]
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<T> Copy for TypedArraySlice<'_, T> {}
+
+impl<T> Default for TypedArray<T> {
+    fn default() -> Self {
+        Self::new(Vec::new())
+    }
+}
+
+impl<T> AsRef<[T]> for TypedArray<T> {
+    #[inline]
+    fn as_ref(&self) -> &[T] {
+        self
+    }
+}
+
+impl<T> AsMut<[T]> for TypedArray<T> {
+    #[inline]
+    fn as_mut(&mut self) -> &mut [T] {
+        &mut *self
+    }
+}
+
+impl<T> IntoIterator for TypedArray<T> {
+    type Item = T;
+    type IntoIter = <Vec<T> as IntoIterator>::IntoIter;
+
+    #[inline]
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<'a, T: Copy> IntoIterator for &'a TypedArray<T> {
+    type Item = T;
+    type IntoIter = Copied<std::slice::Iter<'a, T>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.iter().copied()
+    }
+}
+
+impl<T> Deref for TypedArraySlice<'_, T> {
+    type Target = [T];
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        self.as_ref()
+    }
+}
+
+impl<T> AsRef<[T]> for TypedArraySlice<'_, T> {
+    #[inline]
+    fn as_ref(&self) -> &[T] {
+        self.0
+    }
+}
+
+impl<T: PartialEq> PartialEq<TypedArraySlice<'_, T>> for TypedArray<T> {
+    fn eq(&self, other: &TypedArraySlice<'_, T>) -> bool {
+        self.as_slice().eq(other)
+    }
+}
+
+impl<T: PartialEq> PartialEq<TypedArray<T>> for TypedArraySlice<'_, T> {
+    fn eq(&self, other: &TypedArray<T>) -> bool {
+        other.as_slice().eq(self)
+    }
+}
+
+macro_rules! impl_array {
+    ($num: ty, $alias_name: ident, $slice_name: ident) => {
+        #[doc = concat!(" A partial [`", stringify!($alias_name), "`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/", stringify!($alias_name) ,") implementation.")]
+        pub type $alias_name = TypedArray<$num>;
+
+        #[doc = concat!(" A [`", stringify!($alias_name), "`] slice.")]
+        pub type $slice_name<'a> = TypedArraySlice<'a, $num>;
+
+        impl From<Vec<$num>> for $alias_name {
+            #[inline]
+            fn from(source: Vec<$num>) -> Self {
+                Self(source)
+            }
+        }
+
+        impl FromIterator<$num> for $alias_name {
+            fn from_iter<T: IntoIterator<Item = $num>>(iter: T) -> Self {
+                Self(iter.into_iter().collect())
+            }
+        }
+
+        impl $crate::primitive::TryToJs for $slice_name<'_> {
+            fn try_to_js(&self) -> crate::Result<JsValue> {
+                Ok(js_sys::$alias_name::from(self.as_ref()).unchecked_into())
+            }
+        }
+
+        impl $crate::primitive::TryToJs for $alias_name {
+            fn try_to_js(&self) -> crate::Result<JsValue> {
+                Ok(js_sys::$alias_name::from(self.as_ref()).unchecked_into())
+            }
+        }
+
+        impl $crate::primitive::TryFromJs for $alias_name {
+            fn from_js(js: JsValue) -> Result<Self, $crate::error::SimpleValueError> {
+                match js.dyn_into::<js_sys::$alias_name>() {
+                    Ok(js) => Ok(Self(js.to_vec())),
+                    Err(e) => Err($crate::error::SimpleValueError::DynCast(e)),
+                }
+            }
+        }
+    };
+}
+
+impl_array!(i8, Int8Array, Int8ArraySlice);
+impl_array!(u8, Uint8Array, Uint8ArraySlice);
+impl_array!(i16, Int16Array, Int16ArraySlice);
+impl_array!(u16, Uint16Array, Uint16ArraySlice);
+impl_array!(i32, Int32Array, Int32ArraySlice);
+impl_array!(u32, Uint32Array, Uint32ArraySlice);
+impl_array!(f32, Float32Array, Float32ArraySlice);
+impl_array!(f64, Float64Array, Float64ArraySlice);
+impl_array!(i64, BigInt64Array, BigInt64ArraySlice);
+impl_array!(u64, BigUint64Array, BigUint64ArraySlice);
+
+#[cfg(feature = "serde")]
+const _: () = {
+    use crate::primitive::{TryFromJs, TryToJs};
+    use crate::serde::{DeserialiseFromJs, SerialiseToJs};
+
+    impl<T> SerialiseToJs for TypedArray<T>
+    where
+        Self: TryToJs,
+    {
+        #[inline]
+        fn serialise_to_js(&self) -> crate::Result<JsValue> {
+            self.try_to_js()
+        }
+    }
+
+    impl<T> SerialiseToJs for TypedArraySlice<'_, T>
+    where
+        Self: TryToJs,
+    {
+        #[inline]
+        fn serialise_to_js(&self) -> crate::Result<JsValue> {
+            self.try_to_js()
+        }
+    }
+
+    impl<T> DeserialiseFromJs for TypedArray<T>
+    where
+        Self: TryFromJs,
+    {
+        fn deserialise_from_js(js: JsValue) -> crate::Result<Self> {
+            Self::from_js(js).map_err(Into::into)
+        }
+    }
+};
diff --git a/tests/browser.rs b/tests/browser.rs
new file mode 100644
index 0000000..9cf2c68
--- /dev/null
+++ b/tests/browser.rs
@@ -0,0 +1,6 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_worker);
+
+pub mod tests;
+
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/tests/dedicated_worker.rs b/tests/dedicated_worker.rs
new file mode 100644
index 0000000..f47c928
--- /dev/null
+++ b/tests/dedicated_worker.rs
@@ -0,0 +1,5 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_dedicated_worker);
+
+pub mod tests;
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/tests/shared_worker.rs b/tests/shared_worker.rs
new file mode 100644
index 0000000..1512710
--- /dev/null
+++ b/tests/shared_worker.rs
@@ -0,0 +1,5 @@
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_shared_worker);
+
+pub mod tests;
+#[allow(unused_imports)]
+use tests::prelude;
diff --git a/tests/tests/database/delete_and_list.rs b/tests/tests/database/delete_and_list.rs
new file mode 100644
index 0000000..27f70c3
--- /dev/null
+++ b/tests/tests/database/delete_and_list.rs
@@ -0,0 +1,48 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+use idb_fut::factory::{DBFactory, DatabaseDetails};
+use rand::prelude::*;
+use std::collections::BTreeSet;
+
+async fn collect_dbs(factory: &DBFactory) -> BTreeSet<DatabaseDetails> {
+    factory
+        .databases()
+        .expect("databases()")
+        .await
+        .expect("databases().await")
+        .collect::<Result<BTreeSet<_>, _>>()
+        .expect("try_collect")
+}
+
+#[wasm_bindgen_test]
+pub async fn delete_and_list_dbs() {
+    let factory = DBFactory::new().expect("factory");
+
+    let expected_details =
+        DatabaseDetails::new(random_str(), thread_rng().gen_range(1u8..=u8::MAX) as f64);
+
+    let db = Database::open(expected_details.name())
+        .with_factory(factory.clone())
+        .with_version(expected_details.version())
+        .await
+        .expect("create db");
+
+    {
+        let dbs = collect_dbs(&factory).await;
+        assert!(dbs.contains(&expected_details), "{:?}", dbs);
+    }
+
+    db.delete()
+        .expect("delete()")
+        .await
+        .expect("delete().await");
+
+    {
+        let dbs = collect_dbs(&factory).await;
+        assert!(
+            !collect_dbs(&factory).await.contains(&expected_details),
+            "{:?}",
+            dbs
+        );
+    }
+}
diff --git a/tests/tests/database/delete_obj_store.rs b/tests/tests/database/delete_obj_store.rs
new file mode 100644
index 0000000..8660ba1
--- /dev/null
+++ b/tests/tests/database/delete_obj_store.rs
@@ -0,0 +1,42 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+
+#[wasm_bindgen_test]
+pub async fn invalid_state_error() {
+    let db = random_db_with_store().await;
+    let res = db.delete_object_store(&db.name()).unwrap_err();
+
+    assert_dom_exc!(res, InvalidStateError);
+}
+
+#[wasm_bindgen_test]
+pub async fn not_found_error() {
+    let err = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            db.delete_object_store(&db.name())?;
+            Ok(())
+        })
+        .await
+        .unwrap_err();
+
+    assert_dom_exc!(open err, NotFoundError);
+}
+
+#[wasm_bindgen_test]
+pub async fn happy_path() {
+    let n1 = random_str();
+    let n1_clone = n1.clone();
+
+    let db = Database::open(&n1)
+        .with_on_upgrade_needed(move |_, db| {
+            db.create_object_store(&n1_clone).build()?;
+            db.create_object_store(&random_str())
+                .build()?
+                .delete_object_store()
+        })
+        .await
+        .unwrap();
+
+    let names = db.object_store_names().collect::<Vec<_>>();
+    assert_eq!(names, vec![n1]);
+}
diff --git a/tests/tests/database/mod.rs b/tests/tests/database/mod.rs
new file mode 100644
index 0000000..d0cc734
--- /dev/null
+++ b/tests/tests/database/mod.rs
@@ -0,0 +1,18 @@
+use rand::prelude::*;
+
+pub mod open;
+
+#[cfg(feature = "list-databases")]
+pub mod delete_and_list;
+pub mod delete_obj_store;
+pub mod obj_store_create;
+pub mod transaction;
+
+#[cfg(feature = "version-change")]
+pub mod versionchange;
+
+pub(crate) fn random_db_versions() -> [u8; 2] {
+    const I8_MAX: u8 = i8::MAX as u8;
+    let mut rng = thread_rng();
+    [rng.gen_range(1..I8_MAX), rng.gen_range(I8_MAX..=u8::MAX)]
+}
diff --git a/tests/tests/database/obj_store_create.rs b/tests/tests/database/obj_store_create.rs
new file mode 100644
index 0000000..7667bfe
--- /dev/null
+++ b/tests/tests/database/obj_store_create.rs
@@ -0,0 +1,50 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+
+#[wasm_bindgen_test]
+pub async fn happy_path() {
+    let db = random_db_with_store().await;
+
+    let stores = db.object_store_names().collect::<Vec<_>>();
+    assert_eq!(stores, vec![db.name()]);
+}
+
+#[wasm_bindgen_test]
+pub async fn constraint_error() {
+    let err = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            let name = random_str();
+            db.create_object_store(&name).build()?;
+            db.create_object_store(&name).build()?;
+            Ok(())
+        })
+        .await
+        .unwrap_err();
+
+    assert_dom_exc!(open err, ConstraintError);
+}
+
+#[wasm_bindgen_test]
+pub async fn invalid_access_error() {
+    let err = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            db.create_object_store(&db.name())
+                .with_auto_increment(true)
+                .with_key_path("".into())
+                .build()?;
+            Ok(())
+        })
+        .await
+        .unwrap_err();
+
+    assert_dom_exc!(open err, InvalidAccessError);
+}
+
+#[wasm_bindgen_test]
+pub async fn invalid_state_error() {
+    let name = random_str();
+    let db = Database::open(&name).await.unwrap();
+    let err = db.create_object_store(&name).build().unwrap_err();
+
+    assert_dom_exc!(err, InvalidStateError);
+}
diff --git a/tests/tests/database/open.rs b/tests/tests/database/open.rs
new file mode 100644
index 0000000..e6e7db3
--- /dev/null
+++ b/tests/tests/database/open.rs
@@ -0,0 +1,62 @@
+use super::random_db_versions;
+use crate::prelude::*;
+use idb_fut::database::Database;
+use idb_fut::error::{Error, JSError, OpenDbError};
+use tokio::sync::oneshot;
+use wasm_bindgen_futures::spawn_local;
+
+#[wasm_bindgen_test]
+pub async fn happy_path() {
+    let name = random_str();
+    let version = rand::random::<u16>();
+    let db = Database::open(&name)
+        .with_version(version)
+        .await
+        .expect("Open");
+
+    assert_eq!(db.name(), name);
+    assert_eq!(db.version(), version as f64);
+}
+
+#[wasm_bindgen_test]
+pub async fn forward_error_on_upgrade_needed() {
+    let err_msg = random_str();
+
+    let err = Database::open(random_str())
+        .with_on_upgrade_needed({
+            let err_msg = err_msg.clone();
+            move |_, _| Err(JSError::Error(js_sys::Error::new(&err_msg)).into())
+        })
+        .await
+        .unwrap_err();
+
+    let js_err = match err {
+        OpenDbError::Base(Error::Unknown(JSError::Error(e))) => e,
+        other => panic!("Wrong error: {other}"),
+    };
+
+    assert_eq!(ToString::to_string(&js_err.message()), err_msg);
+}
+
+#[wasm_bindgen_test]
+pub async fn on_blocked() {
+    let [v1, v2] = random_db_versions();
+    let db_name = random_str();
+    let db1 = Database::open(&db_name).with_version(v1).await.unwrap();
+    let (tx, rx) = oneshot::channel();
+    spawn_local(async move {
+        let _ = Database::open(&db_name)
+            .with_version(v2)
+            .with_on_blocked(move |evt| {
+                let _ = tx.send(evt);
+                Ok(())
+            })
+            .await;
+    });
+
+    let evt = rx.await.unwrap();
+    assert_eq!(evt.old_version(), v1 as f64);
+    assert_eq!(evt.new_version(), Some(v2 as f64));
+
+    db1.close();
+}
diff --git a/tests/tests/database/transaction.rs b/tests/tests/database/transaction.rs
new file mode 100644
index 0000000..67a8dc5
--- /dev/null
+++ b/tests/tests/database/transaction.rs
@@ -0,0 +1,20 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+
+#[wasm_bindgen_test]
+pub async fn not_found_error() {
+    let name = random_str();
+    let db = Database::open(&name).await.unwrap();
+    let err = db.transaction(name).build().unwrap_err();
+
+    assert_dom_exc!(err, NotFoundError);
+}
+
+#[wasm_bindgen_test]
+pub async fn invalid_access_error() {
+    let db = Database::open(random_str()).await.unwrap();
+    let names: [String; 0] = [];
+    let err = db.transaction(names).build().unwrap_err();
+
+    assert_dom_exc!(err, InvalidAccessError);
+}
diff --git a/tests/tests/database/versionchange.rs b/tests/tests/database/versionchange.rs
new file mode 100644
index 0000000..91f1740
--- /dev/null
+++ b/tests/tests/database/versionchange.rs
@@ -0,0 +1,46 @@
+use super::random_db_versions;
+use crate::prelude::*;
+use idb_fut::database::Database;
+
+#[wasm_bindgen_test]
+pub async fn basic() {
+    let [v1, v2] = random_db_versions();
+    let db_name = random_str();
+    let db1 = Database::open(&db_name).with_version(v1).await.unwrap();
+    let mut v_change = db1.version_changes().unwrap();
+    helpers::open_v2(db_name, v2);
+
+    let evt = v_change.recv().await.unwrap();
+    assert_eq!(evt.old_version(), v1 as f64);
+    assert_eq!(evt.new_version(), Some(v2 as f64));
+
+    db1.close();
+}
+
+#[wasm_bindgen_test]
+pub async fn stream() {
+    use futures::StreamExt;
+
+    let [v1, v2] = random_db_versions();
+    let db_name = random_str();
+    let db1 = Database::open(&db_name).with_version(v1).await.unwrap();
+    let mut v_change = db1.version_changes().unwrap();
+    helpers::open_v2(db_name, v2);
+
+    let evt = v_change.next().await.unwrap();
+    assert_eq!(evt.old_version(), v1 as f64);
+    assert_eq!(evt.new_version(), Some(v2 as f64));
+
+    db1.close();
+}
+
+mod helpers {
+    use indexed_db_futures::database::Database;
+    use wasm_bindgen_futures::spawn_local;
+
+    pub fn open_v2(db_name: String, version: u8) {
+        spawn_local(async move {
+            let _ = Database::open(db_name).with_version(version).await;
+        });
+    }
+}
diff --git a/tests/tests/date.rs b/tests/tests/date.rs
new file mode 100644
index 0000000..4b6d3f3
--- /dev/null
+++ b/tests/tests/date.rs
@@ -0,0 +1,16 @@
+use crate::prelude::*;
+use idb_fut::date::*;
+
+#[wasm_bindgen_test]
+pub async fn serialisation() {
+    // Strip nanos
+    let now = {
+        let dur = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
+        UNIX_EPOCH + Duration::from_secs(dur.as_secs())
+    };
+
+    let as_js = now.serialise_dyn().unwrap();
+    let as_rs = SystemTime::deserialise_dyn(as_js).unwrap();
+
+    assert_eq!(as_rs, now);
+}
diff --git a/tests/tests/index/create.rs b/tests/tests/index/create.rs
new file mode 100644
index 0000000..4690a48
--- /dev/null
+++ b/tests/tests/index/create.rs
@@ -0,0 +1,29 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+
+#[wasm_bindgen_test]
+pub async fn constraint_error() {
+    let err = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            let name = db.name();
+            let store = db
+                .create_object_store(&name)
+                .with_auto_increment(false)
+                .with_key_path(Key::KEY_PATH)
+                .build()?;
+
+            if let Err(e) = store.create_index(&name, Key::KEY_PATH).build() {
+                let e = js_sys::Error::new(&format!("1st idx creation errored: {e}"));
+                return Err(e.into());
+            }
+
+            // This one should error
+            store.create_index(&name, Key::KEY_PATH).build()?;
+
+            Ok(())
+        })
+        .await
+        .unwrap_err();
+
+    assert_dom_exc!(open err, ConstraintError);
+}
diff --git a/tests/tests/index/mod.rs b/tests/tests/index/mod.rs
new file mode 100644
index 0000000..79c7618
--- /dev/null
+++ b/tests/tests/index/mod.rs
@@ -0,0 +1,9 @@
+macro_rules! open_idx {
+    ($db: expr, $mode: ident > $idx: ident) => {
+        open_tx!($db, $mode > (tx, store));
+        let $idx = store.index(&store.name()).expect("index()");
+    };
+}
+
+pub mod create;
+pub mod query_source;
diff --git a/tests/tests/index/query_source.rs b/tests/tests/index/query_source.rs
new file mode 100644
index 0000000..1fc0a63
--- /dev/null
+++ b/tests/tests/index/query_source.rs
@@ -0,0 +1,190 @@
+#[cfg(feature = "cursors")]
+pub mod cursor;
+
+use crate::prelude::*;
+use idb_fut::database::Database;
+use idb_fut::{KeyPath, KeyRange};
+
+#[wasm_bindgen_test]
+pub async fn count() {
+    async fn count_all(db: &Database) -> idb_fut::Result<u32> {
+        open_idx!(db, Readonly > idx);
+        dyn_await!(idx.count())
+    }
+
+    let db = random_db_idx_keyval().await;
+    assert_eq!(count_all(&db).await, Ok(0), "Initial");
+
+    KeyVal::insert_keyval_docs(&db).await;
+    assert_eq!(count_all(&db).await, Ok(KeyVal::RANGE_LEN), "all");
+
+    let filtered = {
+        open_idx!(db, Readonly > idx);
+        dyn_await!(idx.count().with_query(Value::new(5)..=Value::new(8)))
+    };
+    assert_eq!(filtered, Ok(4), "filtered");
+}
+
+#[wasm_bindgen_test]
+pub async fn get() {
+    let db = random_db_idx_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_idx!(db, Readonly > idx);
+
+    let none = dyn_await!(idx.get::<KeyVal, _, _>(random_str()));
+    assert_eq!(none, Ok(None));
+
+    let one = dyn_await!(idx.get::<KeyVal, Value, _>(KeyRange::Only(Value::MAX)));
+    assert_eq!(one, Ok(Some(KeyVal::new(Key::MIN, Value::MAX))));
+
+    let ranged = dyn_await!(idx.get::<KeyVal, _, _>(Value::new(3)..=Value::new(5)));
+    assert_eq!(ranged, Ok(Some(KeyVal::new(Key::new(-3), Value::new(3)))));
+}
+
+#[wasm_bindgen_test]
+pub async fn get_key() {
+    let db = random_db_idx_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_idx!(db, Readonly > idx);
+
+    let none = dyn_await!(idx.get_key(random_str()));
+    assert_eq!(none, Ok(None));
+
+    let one = {
+        let req = idx
+            .get_key::<Value, _>(KeyRange::Only(Value::MAX))
+            .with_key_type::<Key>();
+        dyn_await!(req)
+    };
+    assert_eq!(one, Ok(Some(Key::MIN)));
+
+    let range = {
+        let req = idx
+            .get_key(Value::new(3)..=Value::new(6))
+            .with_key_type::<Key>();
+        dyn_await!(req)
+    };
+    assert_eq!(range, Ok(Some(Key::new(-3))));
+}
+
+#[wasm_bindgen_test]
+pub async fn get_all() {
+    let db = random_db_idx_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    let all = {
+        open_idx!(db, Readonly > idx);
+        let req = idx.get_all::<KeyVal>();
+        collect!(req)
+    };
+    assert_eq!(all, KeyVal::iter_range().rev().collect::<Vec<_>>());
+
+    let limited = {
+        open_idx!(db, Readonly > idx);
+        let req = idx.get_all::<KeyVal>().with_limit(3);
+        collect!(req)
+    };
+    assert_eq!(
+        limited,
+        KeyVal::iter_range().rev().take(3).collect::<Vec<_>>()
+    );
+
+    let filtered = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx
+            .get_all::<KeyVal>()
+            .with_query(Value::new(2)..Value::new(7)))
+    };
+    assert_eq!(
+        filtered,
+        KeyVal::iter_range()
+            .rev()
+            .skip(1)
+            .take(5)
+            .collect::<Vec<_>>()
+    );
+
+    let filtered_limited = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx
+            .get_all::<KeyVal>()
+            .with_query(Value::new(4)..)
+            .with_limit(2))
+    };
+    assert_eq!(
+        filtered_limited,
+        KeyVal::iter_range()
+            .rev()
+            .skip(3)
+            .take(2)
+            .collect::<Vec<_>>()
+    );
+
+    let none = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx.get_all::<KeyVal>().with_query(random_str()))
+    };
+    assert_eq!(none, Vec::new());
+}
+
+#[wasm_bindgen_test]
+pub async fn get_all_keys() {
+    let db = random_db_idx_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    let all = {
+        open_idx!(db, Readonly > idx);
+        let req = idx.get_all_keys::<Key>();
+        collect!(req)
+    };
+    assert_eq!(all, Key::iter_range().rev().collect::<Vec<_>>());
+
+    let limited = {
+        open_idx!(db, Readonly > idx);
+        let req = idx.get_all_keys::<Key>().with_limit(3);
+        collect!(req)
+    };
+    assert_eq!(limited, Key::iter_range().rev().take(3).collect::<Vec<_>>());
+
+    let filtered = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx
+            .get_all_keys::<Key>()
+            .with_query(Value::new(2)..Value::new(5)))
+    };
+    assert_eq!(
+        filtered,
+        Key::iter_range().rev().skip(1).take(3).collect::<Vec<_>>()
+    );
+
+    let filtered_limited = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx
+            .get_all_keys::<Key>()
+            .with_query(Value::new(3)..Value::new(7))
+            .with_limit(2))
+    };
+    assert_eq!(
+        filtered_limited,
+        Key::iter_range().rev().skip(2).take(2).collect::<Vec<_>>()
+    );
+
+    let none = {
+        open_idx!(db, Readonly > idx);
+        collect!(idx.get_all_keys::<Key>().with_query(random_str()))
+    };
+    assert_eq!(none, Vec::<Key>::new());
+}
+
+#[wasm_bindgen_test]
+pub async fn key_path() {
+    let db = random_db_idx_keyval().await;
+    open_idx!(db, Readonly > idx);
+
+    assert_eq!(
+        idx.key_path(),
+        Some(KeyPath::<String>::One(Value::PATH.into()))
+    );
+}
diff --git a/tests/tests/index/query_source/cursor.rs b/tests/tests/index/query_source/cursor.rs
new file mode 100644
index 0000000..9f5bdee
--- /dev/null
+++ b/tests/tests/index/query_source/cursor.rs
@@ -0,0 +1,412 @@
+pub mod key_cursor {
+    use crate::prelude::*;
+    use idb_fut::cursor::CursorDirection;
+
+    #[wasm_bindgen_test]
+    pub async fn empty() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+        open_idx!(db, Readonly > idx);
+
+        let cur = {
+            let req = idx.open_key_cursor().with_query(random_str());
+            dyn_await!(req).unwrap()
+        };
+        assert!(cur.is_none());
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn next() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+            next_key!(Value, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(Value::MIN)));
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn direction() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_idx!(db, Readonly > idx);
+            let req = idx.open_key_cursor().with_direction(CursorDirection::Prev);
+            let mut cursor = dyn_await!(req).unwrap().unwrap();
+            next_key!(Value, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(Value::MAX)));
+    }
+
+    pub mod base_cursor {
+        use crate::prelude::*;
+
+        #[wasm_bindgen_test]
+        pub async fn primary_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+
+            let initial = primary_key!(Key, cursor);
+            assert_eq!(initial, Ok(Some(Key::MAX)));
+
+            // First next() shouldn't actually advance the cursor, but, rather, return the 1st element without advancing
+            let next_key = next_key!(Value, cursor);
+            assert_eq!(next_key, Ok(Some(Value::MIN)));
+
+            // Should remain the same
+            assert_eq!(primary_key!(Key, cursor), initial);
+
+            let next_key = next_key!(Value, cursor);
+            assert_eq!(next_key, Ok(Some(Value::MIN + 1)));
+
+            assert_eq!(primary_key!(Key, cursor), Ok(Some(Key::MAX - 1)));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn advance_by() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+
+            cursor.advance_by(5).await.unwrap();
+
+            let pk1 = primary_key!(Key, cursor);
+            let key1 = next_key!(Value, cursor);
+            let pk2 = primary_key!(Key, cursor);
+            let key2 = next_key!(Value, cursor);
+            let pk3 = primary_key!(Key, cursor);
+
+            assert_eq!(pk1, Ok(Some(Key::MAX - 5)));
+            assert_eq!(key1, Ok(Some(Value::MIN + 5)));
+            assert_eq!(pk2, Ok(Some(Key::MAX - 5)));
+            assert_eq!(key2, Ok(Some(Value::MIN + 6)));
+            assert_eq!(pk3, Ok(Some(Key::MAX - 6)));
+
+            cursor.advance_by(u8::MAX as u32).await.unwrap();
+
+            assert_dom_exc!(next_key!(Key, cursor).unwrap_err(), InvalidStateError);
+            assert_dom_exc!(cursor.advance_by(1).await.unwrap_err(), InvalidStateError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_primary_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_primary_key(&key, &key).await
+            }
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(
+                continue_to_pkey!(Value::new(5), Key::new(-5), cursor),
+                Ok(())
+            );
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_key!(Value, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(Value::new(5))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_key(key)
+            }
+            .await
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(continue_to_key!(Value::new(5), cursor), Ok(()));
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_key!(Value, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(Value::new(5))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+    }
+
+    #[cfg(feature = "streams")]
+    pub mod key_stream {
+        use crate::prelude::*;
+        use futures::TryStreamExt;
+        use idb_fut::cursor::CursorDirection;
+
+        #[wasm_bindgen_test]
+        pub async fn all() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let cursor = dyn_await!(idx.open_key_cursor()).unwrap().unwrap();
+            let stream = open_kstream!(cursor, Value);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Value::iter_range().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let cursor = {
+                let req = idx
+                    .open_key_cursor()
+                    .with_query(Value::new(4)..=Value::new(7));
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Value);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (4u8..=7).map(Value::new).collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_direction() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let cursor = {
+                let req = idx.open_key_cursor().with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Value);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Value::iter_range().rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query_and_direction() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let cursor = {
+                let req = idx
+                    .open_key_cursor()
+                    .with_query(Value::new(4)..=Value::new(7))
+                    .with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Value);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (4u8..=7).map(Value::new).rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+    }
+}
+
+#[allow(clippy::module_inception)]
+pub mod cursor {
+    use crate::prelude::*;
+    use idb_fut::cursor::CursorDirection;
+
+    #[wasm_bindgen_test]
+    pub async fn empty() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+        open_idx!(db, Readonly > idx);
+
+        let cur = {
+            let req = idx.open_cursor().with_query(random_str());
+            dyn_await!(req).unwrap()
+        };
+        assert!(cur.is_none());
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn next() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+            next_record!(KeyVal, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(KeyVal::new(Key::MAX, Value::MIN))));
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn iterate_whole_db() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        open_idx!(db, Readonly > idx);
+        let mut all = Vec::with_capacity(KeyVal::RANGE_LEN as usize);
+        let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+
+        while let Some(record) = next_record!(KeyVal, cursor).unwrap() {
+            all.push(record);
+        }
+
+        let expect = KeyVal::iter_range().rev().collect::<Vec<_>>();
+        assert_eq!(all, expect);
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn direction() {
+        let db = random_db_idx_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_idx!(db, Readonly > idx);
+            let req = idx.open_cursor().with_direction(CursorDirection::Prev);
+            let mut cursor = dyn_await!(req).unwrap().unwrap();
+            next_record!(KeyVal, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(KeyVal::new(Key::MIN, Value::MAX))));
+    }
+
+    pub mod base_cursor {
+        pub use crate::prelude::*;
+
+        #[wasm_bindgen_test]
+        pub async fn primary_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+
+            let initial = primary_key!(Key, cursor);
+            assert_eq!(initial, Ok(Some(Key::MAX)));
+
+            // First next() shouldn't actually advance the cursor, but, rather, return the 1st element without advancing
+            let next_record = next_record!(KeyVal, cursor);
+            assert_eq!(next_record, Ok(Some(KeyVal::new(Key::MAX, Value::MIN))));
+
+            // Should remain the same
+            assert_eq!(primary_key!(Key, cursor), initial);
+
+            let next_record = next_record!(KeyVal, cursor);
+            assert_eq!(
+                next_record,
+                Ok(Some(KeyVal::new(Key::MAX - 1, Value::MIN + 1)))
+            );
+
+            assert_eq!(primary_key!(Key, cursor), Ok(Some(Key::MAX - 1)));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn advance_by() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+
+            cursor.advance_by(5).await.unwrap();
+
+            let pk1 = primary_key!(Key, cursor);
+            let record1 = next_record!(KeyVal, cursor);
+            let pk2 = primary_key!(Key, cursor);
+            let record2 = next_record!(KeyVal, cursor);
+            let pk3 = primary_key!(Key, cursor);
+
+            assert_eq!(pk1, Ok(Some(Key::MAX - 5)));
+            assert_eq!(record1, Ok(Some(KeyVal::new(Key::MAX - 5, Value::MIN + 5))));
+            assert_eq!(pk2, Ok(Some(Key::MAX - 5)));
+            assert_eq!(record2, Ok(Some(KeyVal::new(Key::MAX - 6, Value::MIN + 6))));
+            assert_eq!(pk3, Ok(Some(Key::MAX - 6)));
+
+            cursor.advance_by(u8::MAX as u32).await.unwrap();
+
+            assert_dom_exc!(next_record!(KeyVal, cursor).unwrap_err(), InvalidStateError);
+            assert_dom_exc!(cursor.advance_by(1).await.unwrap_err(), InvalidStateError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_key(key)
+            }
+            .await
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(continue_to_key!(Value::new(5), cursor), Ok(()));
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_record!(KeyVal, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(KeyVal::new(Key::new(-5), Value::new(5)))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_primary_key() {
+            let db = random_db_idx_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_idx!(db, Readonly > idx);
+            let mut cursor = dyn_await!(idx.open_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_key(key)
+            }
+            .await
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(
+                continue_to_pkey!(Value::new(5), Key::new(-5), cursor),
+                Ok(())
+            );
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_record!(KeyVal, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(KeyVal::new(Key::new(-5), Value::new(5)))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+    }
+}
diff --git a/tests/tests/key_path.rs b/tests/tests/key_path.rs
new file mode 100644
index 0000000..9cb1d2f
--- /dev/null
+++ b/tests/tests/key_path.rs
@@ -0,0 +1,30 @@
+use crate::prelude::*;
+use idb_fut::KeyPath;
+use smallvec::smallvec;
+
+#[wasm_bindgen_test]
+pub fn one() {
+    let js = KeyPath::from("foo").to_js();
+    let rs = KeyPath::from(js.clone());
+    let expect = KeyPath::One(String::from("foo"));
+
+    assert_eq!(rs, expect);
+}
+
+#[wasm_bindgen_test]
+pub fn sequence() {
+    let js = KeyPath::from(["foo", "bar"]).to_js();
+    let rs = KeyPath::from(js.clone());
+    let expect = KeyPath::Sequence(smallvec![String::from("foo"), String::from("bar")]);
+
+    assert_eq!(rs, expect);
+}
+
+#[wasm_bindgen_test]
+pub fn raw() {
+    let js = KeyPath::from(JsValue::NULL).to_js();
+    let rs = KeyPath::from(js.clone());
+    let expect = KeyPath::JsValue(JsValue::NULL);
+
+    assert_eq!(rs, expect);
+}
diff --git a/tests/tests/mod.rs b/tests/tests/mod.rs
new file mode 100644
index 0000000..5c4c329
--- /dev/null
+++ b/tests/tests/mod.rs
@@ -0,0 +1,182 @@
+macro_rules! assert_dom_exc {
+    ($err: expr, $dom_exc: ident) => {{
+        let err = $err;
+        let m = matches!(
+            err,
+            ::indexed_db_futures::error::Error::DomException(
+                ::indexed_db_futures::error::DomException::$dom_exc(_)
+            )
+        );
+        assert!(m, "{err:?}")
+    }};
+    (open $err: expr, $dom_exc: ident) => {{
+        let err = $err;
+        let m = matches!(
+            err,
+            ::indexed_db_futures::error::OpenDbError::Base(
+                ::indexed_db_futures::error::Error::DomException(
+                    ::indexed_db_futures::error::DomException::$dom_exc(_)
+                )
+            )
+        );
+        assert!(m, "{err:?}")
+    }};
+}
+
+macro_rules! open_tx {
+    ($db: expr, $mode: ident > ($tx: ident, $store: ident named $store_name: expr)) => {
+        let $tx = ::indexed_db_futures::Build::build(
+            $db.transaction(&$db.name()).with_mode(::indexed_db_futures::transaction::TransactionMode::$mode)
+        ).expect("tx build");
+        let $store = $tx.object_store($store_name).expect("object_store()");
+    };
+    ($db: expr, $mode: ident > ($tx: ident, $store: ident)) => {
+        open_tx!($db, $mode > ($tx, $store named &$db.name()));
+    };
+}
+
+macro_rules! dyn_await {
+    ($builder: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                idb_fut::BuildSerde::serde($builder).expect("build()").await
+            } else {
+                $builder.await
+            }
+        }
+    }};
+}
+
+macro_rules! collect {
+    ($req: expr) => {
+        dyn_await!($req)
+            .expect("req")
+            .collect::<idb_fut::Result<Vec<_>>>()
+            .expect("collect")
+    };
+}
+
+#[cfg(feature = "cursors")]
+macro_rules! next_key {
+    ($ty: ty, $cursor: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.next_key_ser::<$ty>()
+            } else {
+                $cursor.next_key::<$ty>()
+            }
+        }
+    }
+    .await};
+}
+
+#[cfg(feature = "cursors")]
+macro_rules! primary_key {
+    ($ty: ty, $cursor: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.primary_key_ser::<$ty>()
+            } else {
+                $cursor.primary_key::<$ty>()
+            }
+        }
+    }};
+}
+
+#[cfg(feature = "cursors")]
+macro_rules! continue_to_key {
+    ($key: expr, $cursor: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.continue_to_key_ser($key)
+            } else {
+                $cursor.continue_to_key($key)
+            }
+        }
+    }
+    .await};
+}
+
+#[cfg(all(feature = "cursors", feature = "indices"))]
+macro_rules! continue_to_pkey {
+    ($key: expr, $pkey: expr, $cursor: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.continue_to_primary_key_ser($key, $pkey)
+            } else {
+                $cursor.continue_to_primary_key($key, $pkey)
+            }
+        }
+    }
+    .await};
+}
+
+#[cfg(feature = "cursors")]
+macro_rules! next_record {
+    ($ty: ty, $cursor: expr) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.next_record_ser::<$ty>()
+            } else {
+                $cursor.next_record::<$ty>()
+            }
+        }
+    }
+    .await};
+}
+
+#[cfg(all(feature = "streams", feature = "cursors"))]
+macro_rules! open_kstream {
+    ($cursor: ident, $ty: ty) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.key_stream_ser::<$ty>()
+            } else {
+                $cursor.key_stream::<$ty>()
+            }
+        }
+    }};
+}
+
+#[cfg(all(feature = "streams", feature = "cursors"))]
+macro_rules! open_stream {
+    ($cursor: ident, $ty: ty) => {{
+        ::cfg_if::cfg_if! {
+            if #[cfg(feature = "serde")] {
+                $cursor.stream_ser::<$ty>()
+            } else {
+                $cursor.stream::<$ty>()
+            }
+        }
+    }};
+}
+
+pub mod utils;
+
+pub mod database;
+#[cfg(feature = "dates")]
+pub mod date;
+#[cfg(feature = "indices")]
+pub mod index;
+pub mod key_path;
+pub mod object_store;
+pub mod primitive;
+pub mod transaction;
+
+#[allow(unused_imports)]
+pub mod prelude {
+    pub use super::utils::dummy_data::*;
+    pub use super::utils::init::*;
+    pub use super::utils::{random_str, BuildDyn};
+    pub use idb_fut::database::VersionChangeEvent;
+    pub use idb_fut::prelude::*;
+    pub use idb_fut::primitive::{TryFromJs, TryToJs};
+    pub use indexed_db_futures as idb_fut;
+    pub use wasm_bindgen::prelude::*;
+    pub use wasm_bindgen_test::wasm_bindgen_test;
+
+    #[cfg(feature = "_serialise-deserialise-dyn")]
+    pub use super::utils::{DeserialiseDyn, SerialiseDyn};
+
+    pub use futures::{Stream, StreamExt, TryFuture, TryFutureExt, TryStream, TryStreamExt};
+}
diff --git a/tests/tests/object_store/add_put.rs b/tests/tests/object_store/add_put.rs
new file mode 100644
index 0000000..3c3eb6f
--- /dev/null
+++ b/tests/tests/object_store/add_put.rs
@@ -0,0 +1,104 @@
+macro_rules! common_tests {
+    ($method: ident) => {
+        #[wasm_bindgen_test]
+        pub async fn readonly_error() {
+            let db = random_db_keyval().await;
+            open_tx!(db, Readonly > (tx, store));
+            let err = store.$method(Value::default()).build_dyn().unwrap_err();
+
+            assert_dom_exc!(err, ReadOnlyError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn data_error_inline_key() {
+            let db = random_db_with_init(move |_, db| {
+                db.create_object_store(&db.name())
+                    .with_key_path("foo".into())
+                    .build()?;
+                Ok(())
+            })
+            .await;
+            open_tx!(db, Readwrite > (tx, store));
+            let err = store
+                .$method(Value::default())
+                .with_key(Key::default())
+                .build_dyn()
+                .unwrap_err();
+
+            assert_dom_exc!(err, DataError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn data_error_out_of_line_key() {
+            let db = random_db_with_store().await;
+            open_tx!(db, Readwrite > (tx, store));
+            let err = store.$method(Value::default()).build_dyn().unwrap_err();
+
+            assert_dom_exc!(err, DataError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn data_error_invalid_key() {
+            let db = random_db_with_store().await;
+            open_tx!(db, Readwrite > (tx, store));
+            let err = store
+                .$method("foo")
+                .with_key(js_sys::Symbol::for_("foo").unchecked_into::<JsValue>())
+                .primitive()
+                .unwrap_err();
+
+            assert_dom_exc!(err, DataError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn str_key_autohandling() {
+            let expect_str = random_str();
+            let db = random_db_with_store().await;
+            open_tx!(db, Readwrite > (tx, store));
+
+            let res = store.$method(1u8).with_key(expect_str.as_str()).await;
+            assert_eq!(res, Ok(expect_str));
+        }
+    };
+}
+
+pub mod add {
+    use crate::prelude::*;
+
+    common_tests!(add);
+
+    #[wasm_bindgen_test]
+    pub async fn duplicate_add() {
+        let db = random_db_keyval().await;
+        open_tx!(db, Readwrite > (tx, store));
+
+        let record = KeyVal::new(Key::MIN, Value::MIN);
+        let initial = dyn_await!(store.add(record).with_key_type::<Key>());
+        assert_eq!(initial, Ok(Key::MIN));
+
+        let err = store
+            .add(record)
+            .with_key_type::<Key>()
+            .build_dyn()
+            .unwrap()
+            .await
+            .unwrap_err();
+        assert_dom_exc!(err, ConstraintError);
+    }
+}
+
+pub mod put {
+    use crate::prelude::*;
+
+    common_tests!(put);
+
+    #[wasm_bindgen_test]
+    pub async fn duplicate_add() {
+        let db = random_db_keyval().await;
+        open_tx!(db, Readwrite > (tx, store));
+
+        let record = KeyVal::new(Key::MAX, Value::MAX);
+        let initial = dyn_await!(store.add(record).with_key_type::<Key>());
+        assert_eq!(initial, Ok(Key::MAX));
+    }
+}
diff --git a/tests/tests/object_store/clear.rs b/tests/tests/object_store/clear.rs
new file mode 100644
index 0000000..c73a090
--- /dev/null
+++ b/tests/tests/object_store/clear.rs
@@ -0,0 +1,20 @@
+use crate::prelude::*;
+
+#[wasm_bindgen_test]
+pub async fn readonly_error() {
+    let db = random_db_with_store().await;
+    open_tx!(db, Readonly > (tx, store));
+    assert_dom_exc!(store.clear().unwrap_err(), ReadOnlyError);
+}
+
+#[wasm_bindgen_test]
+pub async fn happy_path() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readwrite > (tx, store));
+    assert_ne!(dyn_await!(store.count()).unwrap(), 0);
+
+    store.clear().unwrap().await.unwrap();
+    assert_eq!(dyn_await!(store.count()), Ok(0));
+}
diff --git a/tests/tests/object_store/delete.rs b/tests/tests/object_store/delete.rs
new file mode 100644
index 0000000..874fa86
--- /dev/null
+++ b/tests/tests/object_store/delete.rs
@@ -0,0 +1,61 @@
+use crate::prelude::*;
+use idb_fut::KeyRange;
+
+#[wasm_bindgen_test]
+pub async fn readonly_error() {
+    let db = random_db_with_store().await;
+    open_tx!(db, Readonly > (tx, store));
+    let err = store.delete(0u8).build_dyn().unwrap_err();
+
+    assert_dom_exc!(err, ReadOnlyError);
+}
+
+#[wasm_bindgen_test]
+pub async fn data_error() {
+    let db = random_db_with_store().await;
+    open_tx!(db, Readwrite > (tx, store));
+
+    let key = KeyRange::Only(js_sys::Symbol::for_(".").unchecked_into::<JsValue>());
+    let err = store.delete::<JsValue, _>(key).build().unwrap_err();
+
+    assert_dom_exc!(err, DataError);
+}
+
+#[wasm_bindgen_test]
+pub async fn delete_one() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readwrite > (tx, store));
+
+    dyn_await!(store.delete(-1i8)).unwrap();
+
+    let mut actual = dyn_await!(store.get_all::<KeyVal>())
+        .expect("get_all")
+        .collect::<idb_fut::Result<Vec<_>>>()
+        .expect("collect");
+    actual.sort_unstable();
+
+    let mut expected = KeyVal::iter_range()
+        .filter(|kv| kv.key() != -1)
+        .collect::<Vec<_>>();
+    expected.sort_unstable();
+
+    assert_eq!(actual, expected);
+}
+
+#[wasm_bindgen_test]
+pub async fn delete_multi() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readwrite > (tx, store));
+    store.delete(i8::MIN..*Key::MAX).await.unwrap();
+
+    let records = dyn_await!(store.get_all::<KeyVal>())
+        .expect("get_all")
+        .collect::<idb_fut::Result<Vec<_>>>()
+        .expect("collect");
+
+    assert_eq!(records, vec![KeyVal::new(Key::MAX, Value::MIN)]);
+}
diff --git a/tests/tests/object_store/mod.rs b/tests/tests/object_store/mod.rs
new file mode 100644
index 0000000..115a17d
--- /dev/null
+++ b/tests/tests/object_store/mod.rs
@@ -0,0 +1,4 @@
+pub mod add_put;
+pub mod clear;
+pub mod delete;
+pub mod query_source;
diff --git a/tests/tests/object_store/query_source.rs b/tests/tests/object_store/query_source.rs
new file mode 100644
index 0000000..790c4b4
--- /dev/null
+++ b/tests/tests/object_store/query_source.rs
@@ -0,0 +1,168 @@
+pub mod key_path;
+
+#[cfg(feature = "cursors")]
+pub mod cursor;
+
+use crate::prelude::*;
+use idb_fut::database::Database;
+use idb_fut::KeyRange;
+
+#[wasm_bindgen_test]
+pub async fn count() {
+    async fn count_all(db: &Database) -> idb_fut::Result<u32> {
+        open_tx!(db, Readonly > (tx, store));
+        dyn_await!(store.count())
+    }
+
+    let db = random_db_keyval().await;
+    assert_eq!(count_all(&db).await, Ok(0), "Initial");
+
+    KeyVal::insert_keyval_docs(&db).await;
+    assert_eq!(count_all(&db).await, Ok(KeyVal::RANGE_LEN), "all");
+
+    let filtered = {
+        open_tx!(db, Readonly > (tx, store));
+        dyn_await!(store.count().with_query(Key::new(-5)..Key::new(-2)))
+    };
+    assert_eq!(filtered, Ok(3), "filtered");
+}
+
+#[wasm_bindgen_test]
+pub async fn get() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readonly > (tx, store));
+
+    let none = dyn_await!(store.get::<KeyVal, _, _>(random_str()));
+    assert_eq!(none, Ok(None));
+
+    let one = dyn_await!(store.get::<KeyVal, Key, _>(KeyRange::Only(Key::MAX)));
+    assert_eq!(one, Ok(Some(KeyVal::new(Key::MAX, Value::MIN))));
+
+    let ranged = dyn_await!(store.get::<KeyVal, _, _>(Key::new(-3)..=Key::new(3)));
+    assert_eq!(ranged, Ok(Some(KeyVal::new(Key::new(-3), Value::new(3)))));
+}
+
+#[wasm_bindgen_test]
+pub async fn get_key() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readonly > (tx, store));
+
+    let none = dyn_await!(store.get_key(random_str()));
+    assert_eq!(none, Ok(None));
+
+    let one = dyn_await!(store.get_key(KeyRange::Only(Key::MAX)));
+    assert_eq!(one, Ok(Some(Key::MAX)));
+
+    let retype = {
+        let req = store
+            .get_key::<Key, _>(KeyRange::Only(Key::MAX))
+            .with_key_type::<i8>();
+        dyn_await!(req)
+    };
+    assert_eq!(retype, Ok(Some(*Key::MAX)));
+
+    let range = dyn_await!(store.get_key(Key::new(-3)..=Key::new(3)));
+    assert_eq!(range, Ok(Some(Key::new(-3))));
+}
+
+#[wasm_bindgen_test]
+pub async fn get_all() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    let all = {
+        open_tx!(db, Readonly > (tx, store));
+        let req = store.get_all::<KeyVal>();
+        collect!(req)
+    };
+    assert_eq!(all, KeyVal::iter_range().collect::<Vec<_>>());
+
+    let limited = {
+        open_tx!(db, Readonly > (tx, store));
+        let req = store.get_all::<KeyVal>().with_limit(3);
+        collect!(req)
+    };
+    assert_eq!(limited, KeyVal::iter_range().take(3).collect::<Vec<_>>());
+
+    let filtered = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store
+            .get_all::<KeyVal>()
+            .with_query(Key::new(-7)..Key::new(-2)))
+    };
+    assert_eq!(
+        filtered,
+        KeyVal::iter_range().skip(3).take(5).collect::<Vec<_>>()
+    );
+
+    let filtered_limited = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store
+            .get_all::<KeyVal>()
+            .with_query(Key::new(-7)..)
+            .with_limit(2))
+    };
+    assert_eq!(
+        filtered_limited,
+        KeyVal::iter_range().skip(3).take(2).collect::<Vec<_>>()
+    );
+
+    let none = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store.get_all::<KeyVal>().with_query(random_str()))
+    };
+    assert_eq!(none, Vec::new());
+}
+
+#[wasm_bindgen_test]
+pub async fn get_all_keys() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    let all = {
+        open_tx!(db, Readonly > (tx, store));
+        let req = store.get_all_keys::<Key>();
+        collect!(req)
+    };
+    assert_eq!(all, Key::iter_range().collect::<Vec<_>>());
+
+    let limited = {
+        open_tx!(db, Readonly > (tx, store));
+        let req = store.get_all_keys::<Key>().with_limit(3);
+        collect!(req)
+    };
+    assert_eq!(limited, Key::iter_range().take(3).collect::<Vec<_>>());
+
+    let filtered = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store
+            .get_all_keys::<Key>()
+            .with_query(Key::new(-7)..Key::new(-2)))
+    };
+    assert_eq!(
+        filtered,
+        Key::iter_range().skip(3).take(5).collect::<Vec<_>>()
+    );
+
+    let filtered_limited = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store
+            .get_all_keys::<Key>()
+            .with_query(Key::new(-7)..)
+            .with_limit(2))
+    };
+    assert_eq!(
+        filtered_limited,
+        Key::iter_range().skip(3).take(2).collect::<Vec<_>>()
+    );
+
+    let none = {
+        open_tx!(db, Readonly > (tx, store));
+        collect!(store.get_all_keys::<Key>().with_query(random_str()))
+    };
+    assert_eq!(none, Vec::<Key>::new());
+}
diff --git a/tests/tests/object_store/query_source/cursor.rs b/tests/tests/object_store/query_source/cursor.rs
new file mode 100644
index 0000000..81b8537
--- /dev/null
+++ b/tests/tests/object_store/query_source/cursor.rs
@@ -0,0 +1,593 @@
+pub mod key_cursor {
+    use crate::prelude::*;
+    use idb_fut::cursor::CursorDirection;
+
+    #[wasm_bindgen_test]
+    pub async fn empty() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+        open_tx!(db, Readonly > (tx, store));
+
+        let cur = {
+            let req = store.open_key_cursor().with_query(random_str());
+            dyn_await!(req).unwrap()
+        };
+        assert!(cur.is_none());
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn next() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_key_cursor()).unwrap().unwrap();
+            next_key!(Key, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(Key::MIN)));
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn direction() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_tx!(db, Readonly > (tx, store));
+            let req = store
+                .open_key_cursor()
+                .with_direction(CursorDirection::Prev);
+            let mut cursor = dyn_await!(req).unwrap().unwrap();
+            next_key!(Key, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(Key::MAX)));
+    }
+
+    pub mod base_cursor {
+        use crate::prelude::*;
+
+        #[wasm_bindgen_test]
+        pub async fn primary_key() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_key_cursor()).unwrap().unwrap();
+
+            let initial = primary_key!(Key, cursor);
+            assert_eq!(initial, Ok(Some(Key::MIN)));
+
+            // First next() shouldn't actually advance the cursor, but, rather, return the 1st element without advancing
+            let next_key = next_key!(Key, cursor);
+            assert_eq!(next_key, Ok(Some(Key::MIN)));
+
+            // Should remain the same
+            assert_eq!(primary_key!(Key, cursor), initial);
+
+            let next_key = next_key!(Key, cursor);
+            assert_eq!(next_key, Ok(Some(Key::MIN + 1)));
+
+            assert_eq!(primary_key!(Key, cursor), Ok(Some(Key::MIN + 1)));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn advance_by() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_key_cursor()).unwrap().unwrap();
+
+            cursor.advance_by(5).await.unwrap();
+
+            let pk1 = primary_key!(Key, cursor);
+            let key1 = next_key!(Key, cursor);
+            let pk2 = primary_key!(Key, cursor);
+            let key2 = next_key!(Key, cursor);
+            let pk3 = primary_key!(Key, cursor);
+
+            assert_eq!(pk1, Ok(Some(Key::MIN + 5)));
+            assert_eq!(key1, Ok(Some(Key::MIN + 5)));
+            assert_eq!(pk2, Ok(Some(Key::MIN + 5)));
+            assert_eq!(key2, Ok(Some(Key::MIN + 6)));
+            assert_eq!(pk3, Ok(Some(Key::MIN + 6)));
+
+            cursor.advance_by(u8::MAX as u32).await.unwrap();
+
+            assert_dom_exc!(next_key!(Key, cursor).unwrap_err(), InvalidStateError);
+            assert_dom_exc!(cursor.advance_by(1).await.unwrap_err(), InvalidStateError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_key() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_key_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_key(key)
+            }
+            .await
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(continue_to_key!(Key::new(-5), cursor), Ok(()));
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_key!(Key, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(Key::new(-5))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+    }
+
+    #[cfg(feature = "streams")]
+    pub mod key_stream {
+        use crate::prelude::*;
+        use futures::TryStreamExt;
+        use idb_fut::cursor::CursorDirection;
+
+        #[wasm_bindgen_test]
+        pub async fn all() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = dyn_await!(store.open_key_cursor()).unwrap().unwrap();
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Key::iter_range().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store
+                    .open_key_cursor()
+                    .with_query(Key::new(-7)..=Key::new(-4));
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4).map(Key::new).collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store
+                    .open_key_cursor()
+                    .with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Key::iter_range().rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query_and_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store
+                    .open_key_cursor()
+                    .with_query(Key::new(-7)..=Key::new(-4))
+                    .with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4).map(Key::new).rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+    }
+}
+
+#[allow(clippy::module_inception)]
+pub mod cursor {
+    use crate::prelude::*;
+    use idb_fut::cursor::CursorDirection;
+
+    #[wasm_bindgen_test]
+    pub async fn empty() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+        open_tx!(db, Readonly > (tx, store));
+
+        let cur = {
+            let req = store.open_cursor().with_query(random_str());
+            dyn_await!(req).unwrap()
+        };
+        assert!(cur.is_none());
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn next() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+            next_record!(KeyVal, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(KeyVal::new(Key::MIN, Value::MAX))));
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn direction() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        let next = {
+            open_tx!(db, Readonly > (tx, store));
+            let req = store.open_cursor().with_direction(CursorDirection::Prev);
+            let mut cursor = dyn_await!(req).unwrap().unwrap();
+            next_record!(KeyVal, cursor)
+        };
+
+        assert_eq!(next, Ok(Some(KeyVal::new(Key::MAX, Value::MIN))));
+    }
+
+    #[wasm_bindgen_test]
+    pub async fn iterate_whole_db() {
+        let db = random_db_keyval().await;
+        KeyVal::insert_keyval_docs(&db).await;
+
+        open_tx!(db, Readonly > (tx, store));
+        let mut all = Vec::with_capacity(KeyVal::RANGE_LEN as usize);
+        let mut cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+
+        while let Some(record) = next_record!(KeyVal, cursor).unwrap() {
+            all.push(record);
+        }
+
+        let expect = KeyVal::iter_range().collect::<Vec<_>>();
+        assert_eq!(all, expect);
+    }
+
+    pub mod base_cursor {
+        use crate::prelude::*;
+
+        #[wasm_bindgen_test]
+        pub async fn primary_key() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+
+            let initial = primary_key!(Key, cursor);
+            assert_eq!(initial, Ok(Some(Key::MIN)));
+
+            // First next() shouldn't actually advance the cursor, but, rather, return the 1st element without advancing
+            let next_record = next_record!(KeyVal, cursor);
+            assert_eq!(next_record, Ok(Some(KeyVal::new(Key::MIN, Value::MAX))));
+
+            // Should remain the same
+            assert_eq!(primary_key!(Key, cursor), initial);
+
+            let next_record = next_record!(KeyVal, cursor);
+            assert_eq!(
+                next_record,
+                Ok(Some(KeyVal::new(Key::MIN + 1, Value::MAX - 1)))
+            );
+
+            assert_eq!(primary_key!(Key, cursor), Ok(Some(Key::MIN + 1)));
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn advance_by() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+
+            cursor.advance_by(5).await.unwrap();
+
+            let pk1 = primary_key!(Key, cursor);
+            let record1 = next_record!(KeyVal, cursor);
+            let pk2 = primary_key!(Key, cursor);
+            let record2 = next_record!(KeyVal, cursor);
+            let pk3 = primary_key!(Key, cursor);
+
+            assert_eq!(pk1, Ok(Some(Key::MIN + 5)));
+            assert_eq!(record1, Ok(Some(KeyVal::new(Key::MIN + 5, Value::MAX - 5))));
+            assert_eq!(pk2, Ok(Some(Key::MIN + 5)));
+            assert_eq!(record2, Ok(Some(KeyVal::new(Key::MIN + 6, Value::MAX - 6))));
+            assert_eq!(pk3, Ok(Some(Key::MIN + 6)));
+
+            cursor.advance_by(u8::MAX as u32).await.unwrap();
+
+            assert_dom_exc!(next_record!(KeyVal, cursor).unwrap_err(), InvalidStateError);
+            assert_dom_exc!(cursor.advance_by(1).await.unwrap_err(), InvalidStateError);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn continue_to_key() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let mut cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+
+            let invalid = {
+                let key = js_sys::Symbol::for_(&random_str()).unchecked_into::<JsValue>();
+                cursor.continue_to_key(key)
+            }
+            .await
+            .unwrap_err();
+            assert_dom_exc!(invalid, DataError);
+
+            assert_eq!(continue_to_key!(Key::new(-5), cursor), Ok(()));
+
+            let pk = primary_key!(Key, cursor);
+            let key = next_record!(KeyVal, cursor);
+            let pk2 = primary_key!(Key, cursor);
+
+            assert_eq!(pk, Ok(Some(Key::new(-5))));
+            assert_eq!(key, Ok(Some(KeyVal::new(Key::new(-5), Value::new(5)))));
+            assert_eq!(pk2, Ok(Some(Key::new(-5))));
+        }
+    }
+
+    #[cfg(feature = "streams")]
+    pub mod stream {
+        use crate::prelude::*;
+        use futures::{StreamExt, TryStreamExt};
+        use idb_fut::cursor::CursorDirection;
+        use idb_fut::database::Database;
+
+        #[wasm_bindgen_test]
+        pub async fn all() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+            let stream = open_stream!(cursor, KeyVal);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = KeyVal::iter_range().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store.open_cursor().with_query(Key::new(-7)..=Key::new(-4));
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_stream!(cursor, KeyVal);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4)
+                .map(move |k| KeyVal::new(k, -k as u8))
+                .collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store.open_cursor().with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_stream!(cursor, KeyVal);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = KeyVal::iter_range().rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query_and_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store
+                    .open_cursor()
+                    .with_query(Key::new(-7)..=Key::new(-4))
+                    .with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_stream!(cursor, KeyVal);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4)
+                .map(move |k| KeyVal::new(k, -k as u8))
+                .rev()
+                .collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn update() {
+            async fn mutate(db: &Database) {
+                open_tx!(db, Readwrite > (tx, store));
+                let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+                let mut stream = open_stream!(cursor, KeyVal);
+
+                while let Some(kv) = next_record!(KeyVal, stream).unwrap() {
+                    let new_record = KeyVal::new(kv.key(), kv.value() * 2);
+                    stream.update(new_record).build_dyn().unwrap();
+                }
+
+                tx.commit().await.unwrap();
+            }
+
+            async fn read(db: &Database) {
+                open_tx!(db, Readonly > (tx, store));
+                let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+                let stream = open_stream!(cursor, KeyVal);
+
+                let data = stream.try_collect::<Vec<_>>().await.unwrap();
+                let expect = KeyVal::iter_range()
+                    .map(move |kv| KeyVal::new(kv.key(), kv.value() * 2))
+                    .collect::<Vec<_>>();
+
+                assert_eq!(data, expect);
+            }
+
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            mutate(&db).await;
+            read(&db).await;
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn delete() {
+            async fn mutate(db: &Database) {
+                open_tx!(db, Readwrite > (tx, store));
+                let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+                let mut stream = open_stream!(cursor, KeyVal);
+
+                stream.delete().unwrap();
+                assert_eq!(primary_key!(Key, stream), Ok(Some(Key::MIN)));
+                assert_eq!(
+                    stream.next().await,
+                    Some(Ok(KeyVal::new(Key::MIN + 1, Value::MAX - 1)))
+                );
+                assert_eq!(primary_key!(Key, stream), Ok(Some(Key::MIN + 1)));
+
+                assert_eq!(
+                    stream.next().await,
+                    Some(Ok(KeyVal::new(Key::MIN + 2, Value::MAX - 2)))
+                );
+                stream.delete().unwrap();
+
+                tx.commit().await.unwrap();
+            }
+
+            async fn read(db: &Database) {
+                open_tx!(db, Readonly > (tx, store));
+                let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+                let stream = open_stream!(cursor, KeyVal);
+
+                let data = stream.try_collect::<Vec<_>>().await.unwrap();
+                let expect = KeyVal::iter_range()
+                    .filter(move |kv| kv.key() != Key::MIN && kv.key() != Key::MIN + 2)
+                    .collect::<Vec<_>>();
+
+                assert_eq!(data, expect);
+            }
+
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+
+            mutate(&db).await;
+            read(&db).await;
+        }
+    }
+
+    #[cfg(feature = "streams")]
+    pub mod key_stream {
+        use crate::prelude::*;
+        use idb_fut::cursor::CursorDirection;
+
+        #[wasm_bindgen_test]
+        pub async fn all() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = dyn_await!(store.open_cursor()).unwrap().unwrap();
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Key::iter_range().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store.open_cursor().with_query(Key::new(-7)..=Key::new(-4));
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4).map(Key::new).collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store.open_cursor().with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = Key::iter_range().rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+
+        #[wasm_bindgen_test]
+        pub async fn with_query_and_direction() {
+            let db = random_db_keyval().await;
+            KeyVal::insert_keyval_docs(&db).await;
+            open_tx!(db, Readonly > (tx, store));
+            let cursor = {
+                let req = store
+                    .open_cursor()
+                    .with_query(Key::new(-7)..=Key::new(-4))
+                    .with_direction(CursorDirection::Prev);
+                dyn_await!(req).unwrap().unwrap()
+            };
+            let stream = open_kstream!(cursor, Key);
+
+            let data = stream.try_collect::<Vec<_>>().await.unwrap();
+            let expected = (-7i8..=-4).map(Key::new).rev().collect::<Vec<_>>();
+
+            assert_eq!(data, expected);
+        }
+    }
+}
diff --git a/tests/tests/object_store/query_source/key_path.rs b/tests/tests/object_store/query_source/key_path.rs
new file mode 100644
index 0000000..9522485
--- /dev/null
+++ b/tests/tests/object_store/query_source/key_path.rs
@@ -0,0 +1,52 @@
+use crate::prelude::*;
+use idb_fut::database::Database;
+use idb_fut::KeyPath;
+
+#[wasm_bindgen_test]
+pub async fn auto_incremented() {
+    let db = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            db.create_object_store(&db.name())
+                .with_auto_increment(true)
+                .build()?;
+            Ok(())
+        })
+        .await
+        .unwrap();
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(store.key_path(), None);
+}
+
+#[wasm_bindgen_test]
+pub async fn none() {
+    let db = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            db.create_object_store(&db.name()).build()?;
+            Ok(())
+        })
+        .await
+        .unwrap();
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(store.key_path(), None);
+}
+
+#[wasm_bindgen_test]
+pub async fn explicit() {
+    let db = Database::open(random_str())
+        .with_on_upgrade_needed(move |_, db| {
+            db.create_object_store(&db.name())
+                .with_key_path(Key::KEY_PATH)
+                .build()?;
+            Ok(())
+        })
+        .await
+        .unwrap();
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(
+        store.key_path(),
+        Some(KeyPath::<String>::One(Key::PATH.into()))
+    );
+}
diff --git a/tests/tests/primitive.rs b/tests/tests/primitive.rs
new file mode 100644
index 0000000..a14986d
--- /dev/null
+++ b/tests/tests/primitive.rs
@@ -0,0 +1,120 @@
+use crate::prelude::*;
+use rand::prelude::*;
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
+
+macro_rules! check {
+    ($value: ident, $ty: ty) => {{
+        let js = $value
+            .try_to_js()
+            .expect(concat!("`", stringify!($ty), "` to js"));
+        let rs = <$ty>::from_js(js).expect(concat!("`", stringify!($ty), "` from js"));
+        assert_eq!(rs, $value, stringify!($ty));
+    }};
+}
+
+#[wasm_bindgen_test]
+pub fn floats() {
+    let mut rng = thread_rng();
+
+    macro_rules! gen {
+        ($rng: ident, $($ty: ty),+) => {
+            $({
+                let value = <$ty>::from_be_bytes($rng.gen());
+                check!(value, $ty);
+            })+
+        };
+    }
+
+    gen!(rng, f32, f64);
+}
+
+#[wasm_bindgen_test]
+pub fn integers() {
+    let mut rng = thread_rng();
+    macro_rules! gen {
+        ($rng: ident, $($ty: ty),+) => {
+            $({
+                let value: $ty = $rng.gen();
+                check!(value, $ty);
+            })+
+        };
+    }
+
+    gen!(rng, i8, u8, i16, u16, i32, u32, i64, u64, isize, usize, i128, u128);
+}
+
+#[wasm_bindgen_test]
+pub fn lists() {
+    let mut rng = thread_rng();
+    macro_rules! gen {
+        ($rng: ident, $($ty: ty),+ $(,)?) => {$({
+            let value = <$ty>::from_iter([$rng.gen(), $rng.gen()]);
+            check!(value, $ty);
+        })+};
+    }
+
+    gen!(
+        rng,
+        Vec<usize>,
+        VecDeque<isize>,
+        HashSet<usize>,
+        BTreeSet<isize>
+    );
+
+    let v = rng.gen::<u8>();
+    let js = [v].try_to_js().expect("Arr to");
+    assert_eq!(
+        Vec::<u8>::from_js(js).expect("arr from"),
+        vec![v],
+        "arr from cmp"
+    );
+
+    let js = [v].as_slice().try_to_js().expect("Arr to");
+    assert_eq!(
+        Vec::<u8>::from_js(js).expect("slice from"),
+        vec![v],
+        "slice from cmp"
+    );
+}
+
+#[wasm_bindgen_test]
+pub fn maps() {
+    let mut rng = thread_rng();
+
+    macro_rules! gen {
+        ($rng: ident, $($ty: ty),+ $(,)?) => {
+            $({
+                let value = <$ty>::from_iter([(random_str(), $rng.gen())]);
+                check!(value, $ty);
+            })+
+        };
+    }
+
+    gen!(rng, HashMap<String, isize>, BTreeMap<String, usize>);
+}
+
+#[wasm_bindgen_test]
+pub fn options() {
+    {
+        let value = Some(random::<u8>());
+        check!(value, Option<u8>);
+    }
+
+    assert_eq!(
+        None::<u8>.try_to_js().expect("none to js"),
+        JsValue::UNDEFINED,
+        "none to js cmp"
+    );
+
+    assert_eq!(
+        None,
+        <Option<u8>>::from_js(JsValue::UNDEFINED).expect("undefined from js"),
+        "undefined from js cmp"
+    );
+
+    assert_eq!(
+        None,
+        <Option<u8>>::from_js(JsValue::NULL).expect("null from js"),
+        "null from js cmp"
+    );
+}
diff --git a/tests/tests/transaction/commit_rollback.rs b/tests/tests/transaction/commit_rollback.rs
new file mode 100644
index 0000000..a13febe
--- /dev/null
+++ b/tests/tests/transaction/commit_rollback.rs
@@ -0,0 +1,35 @@
+use crate::prelude::*;
+
+#[wasm_bindgen_test]
+pub async fn explicit_commit() {
+    let db = random_db_keyval().await;
+    KeyVal::insert_keyval_docs(&db).await;
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(dyn_await!(store.count()), Ok(KeyVal::RANGE_LEN));
+}
+
+#[wasm_bindgen_test]
+pub async fn explicit_rollback() {
+    let db = random_db_keyval().await;
+
+    open_tx!(db, Readwrite > (tx, store));
+    store.put(KeyVal::new(0, 0)).build_dyn().unwrap();
+    assert_eq!(tx.abort().await, Ok(()));
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(dyn_await!(store.count()), Ok(0));
+}
+
+#[wasm_bindgen_test]
+pub async fn implicit_rollback() {
+    let db = random_db_keyval().await;
+
+    {
+        open_tx!(db, Readwrite > (tx, store));
+        store.put(KeyVal::default()).build_dyn().unwrap();
+    }
+
+    open_tx!(db, Readonly > (tx, store));
+    assert_eq!(dyn_await!(store.count()), Ok(0));
+}
diff --git a/tests/tests/transaction/mod.rs b/tests/tests/transaction/mod.rs
new file mode 100644
index 0000000..982c4f2
--- /dev/null
+++ b/tests/tests/transaction/mod.rs
@@ -0,0 +1 @@
+pub mod commit_rollback;
diff --git a/tests/tests/utils/conditional_build.rs b/tests/tests/utils/conditional_build.rs
new file mode 100644
index 0000000..6461fd6
--- /dev/null
+++ b/tests/tests/utils/conditional_build.rs
@@ -0,0 +1,77 @@
+use cfg_if::cfg_if;
+use indexed_db_futures as idb_fut;
+
+#[cfg(feature = "_serialise-deserialise-dyn")]
+use wasm_bindgen::prelude::*;
+
+cfg_if! {
+    if #[cfg(feature = "serde")] {
+        use idb_fut::{
+            BuildSerde as BaseBuild,
+        };
+
+        #[cfg(feature = "_serialise-deserialise-dyn")]
+        use idb_fut::{SerialiseToJs as BaseSerialise, DeserialiseFromJs as BaseDeserialise};
+    } else {
+        #[cfg(feature = "_serialise-deserialise-dyn")]
+        use crate::prelude::{TryToJs as BaseSerialise, TryFromJs as BaseDeserialise};
+        use idb_fut::BuildPrimitive as BaseBuild;
+    }
+}
+
+/// Build with `serde` if the feature's enabled, else build with `primitive`.
+pub trait BuildDyn: BaseBuild {
+    fn build_dyn(self) -> idb_fut::Result<Self::Fut>;
+}
+
+/// `TryToJs`/`SerialiseToJs` based on whether `serde` is enabled.
+#[cfg(feature = "_serialise-deserialise-dyn")]
+pub trait SerialiseDyn: BaseSerialise {
+    fn serialise_dyn(&self) -> idb_fut::Result<JsValue>;
+}
+
+/// `TryFromJs`/`DeserialiseFromJs` based on whether `serde` is enabled.
+#[cfg(feature = "_serialise-deserialise-dyn")]
+pub trait DeserialiseDyn: BaseDeserialise {
+    fn deserialise_dyn(js: JsValue) -> idb_fut::Result<Self>
+    where
+        Self: Sized;
+}
+
+impl<T: BaseBuild> BuildDyn for T {
+    fn build_dyn(self) -> idb_fut::Result<Self::Fut> {
+        cfg_if! {
+            if #[cfg(feature = "serde")] {
+                BaseBuild::serde(self)
+            } else {
+                BaseBuild::primitive(self)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "_serialise-deserialise-dyn")]
+impl<T: BaseSerialise> SerialiseDyn for T {
+    fn serialise_dyn(&self) -> idb_fut::Result<JsValue> {
+        cfg_if! {
+            if #[cfg(feature = "serde")] {
+                BaseSerialise::serialise_to_js(self)
+            } else {
+                BaseSerialise::try_to_js(self)
+            }
+        }
+    }
+}
+
+#[cfg(feature = "_serialise-deserialise-dyn")]
+impl<T: BaseDeserialise> DeserialiseDyn for T {
+    fn deserialise_dyn(js: JsValue) -> idb_fut::Result<Self> {
+        cfg_if! {
+            if #[cfg(feature = "serde")] {
+                BaseDeserialise::deserialise_from_js(js)
+            } else {
+                BaseDeserialise::from_js(js).map_err(Into::into)
+            }
+        }
+    }
+}
diff --git a/tests/tests/utils/dummy_data.rs b/tests/tests/utils/dummy_data.rs
new file mode 100644
index 0000000..55fb708
--- /dev/null
+++ b/tests/tests/utils/dummy_data.rs
@@ -0,0 +1,236 @@
+use crate::prelude::*;
+use accessory::Accessors;
+use delegate_display::DelegateFmt;
+use derive_more::{Deref, DerefMut, From};
+use fancy_constructor::new;
+use idb_fut::database::Database;
+use idb_fut::KeyPath;
+use impartial_ord::ImpartialOrd;
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+use std::fmt::{Debug, Formatter};
+use std::iter;
+use std::iter::FusedIterator;
+use std::ops::RangeInclusive;
+
+#[derive(Copy, Clone, Default, Ord, ImpartialOrd, DelegateFmt, Deref, DerefMut, From, new)]
+#[dfmt(ddisplay, ddebug)]
+#[new(const_fn)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
+pub struct Key(i8);
+
+#[derive(Copy, Clone, Default, Ord, ImpartialOrd, DelegateFmt, Deref, DerefMut, From, new)]
+#[dfmt(ddisplay, ddebug)]
+#[new(const_fn)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
+pub struct Value(u8);
+
+#[derive(Copy, Clone, Eq, PartialEq, Default, Ord, ImpartialOrd, new, Accessors)]
+#[access(get, set, defaults(get(const_fn, cp)))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub struct KeyVal {
+    #[new(into)]
+    key: Key,
+
+    #[new(into)]
+    value: Value,
+}
+
+impl Key {
+    #[allow(unused)]
+    pub const PATH: &'static str = "key";
+
+    #[allow(unused)]
+    pub const KEY_PATH: KeyPath<&'static str> = KeyPath::One(Self::PATH);
+
+    pub const MIN: Self = Self(-10);
+    pub const MAX: Self = Self(-1);
+
+    #[allow(unused)]
+    pub fn iter_range() -> iter::Map<RangeInclusive<i8>, fn(i8) -> Self> {
+        (*Self::MIN..=*Self::MAX).map(Self::new)
+    }
+}
+
+impl Value {
+    #[allow(unused)]
+    pub const PATH: &'static str = "value";
+
+    #[allow(unused)]
+    pub const KEY_PATH: KeyPath<&'static str> = KeyPath::One(Self::PATH);
+
+    pub const MIN: Self = Self(1);
+    pub const MAX: Self = Self(10);
+
+    #[allow(unused)]
+    pub fn iter_range() -> iter::Map<RangeInclusive<u8>, fn(u8) -> Self> {
+        (*Self::MIN..=*Self::MAX).map(Self::new)
+    }
+}
+
+impl KeyVal {
+    pub const RANGE_LEN: u32 = (Value::MAX.0 + 1 - Value::MIN.0) as u32;
+
+    pub async fn insert_keyval_docs(db: &Database) {
+        open_tx!(db, Readwrite > (tx, store));
+
+        for record in Self::iter_range() {
+            if let Err(e) = store.add(record).build_dyn() {
+                panic!("Error inserting {record:?}: {e}");
+            }
+        }
+
+        tx.commit().await.expect("commit");
+    }
+
+    pub fn iter_range() -> impl FusedIterator<Item = Self> + DoubleEndedIterator + ExactSizeIterator
+    {
+        (*Key::MIN..=*Key::MAX).map(move |k| Self::new(Key::new(k), Value::new(-k as u8)))
+    }
+}
+
+impl Debug for KeyVal {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        Debug::fmt(&(self.key(), self.value()), f)
+    }
+}
+
+macro_rules! impl_eq {
+    ($($outer: ident ($inner: ident)),+) => {$(
+       impl Eq for $outer {}
+       impl PartialEq<$inner> for $outer {
+           #[inline]
+           fn eq(&self, other: &$inner) -> bool {
+             other.eq(&self.0)
+           }
+       }
+
+       impl PartialEq for $outer {
+           #[inline]
+           fn eq(&self, other: &$outer) -> bool {
+             self.0 == other.0
+           }
+       }
+    )+};
+}
+
+macro_rules! impl_math {
+    ($($outer: ident ($inner: ident)),+) => {$(
+        impl ::std::ops::Add<$inner> for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn add(self, rhs: $inner) -> Self {
+                Self(self.0 + rhs)
+            }
+        }
+
+        impl ::std::ops::Add for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn add(self, rhs: Self) -> Self {
+                self + rhs.0
+            }
+        }
+
+        impl ::std::ops::Sub<$inner> for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn sub(self, rhs: $inner) -> Self {
+                Self(self.0 - rhs)
+            }
+        }
+
+        impl ::std::ops::Sub for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn sub(self, rhs: Self) -> Self {
+                self - rhs.0
+            }
+        }
+
+        impl ::std::ops::Mul<$inner> for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn mul(self, rhs: $inner) -> Self {
+                Self(self.0 * rhs)
+            }
+        }
+
+        impl ::std::ops::Mul for $outer {
+            type Output = Self;
+
+            #[inline]
+            fn mul(self, rhs: Self) -> Self {
+                self * rhs.0
+            }
+        }
+    )+};
+}
+
+impl_eq!(Key(i8), Value(u8));
+impl_math!(Key(i8), Value(u8));
+
+#[cfg(not(feature = "serde"))]
+const _: () = {
+    use crate::prelude::*;
+    use idb_fut::error::SimpleValueError;
+    use js_sys::Reflect;
+
+    macro_rules! primitives {
+        ($($ty: ident),+ $(,)?) => {
+          $(
+              impl TryFromJs for $ty {
+                fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+                   TryFromJs::from_js(js).map(Self)
+                }
+              }
+
+              impl TryToJs for $ty {
+                #[inline]
+                fn try_to_js(&self) -> idb_fut::Result<JsValue> {
+                   TryToJs::try_into_js(self.0)
+                }
+              }
+          )+
+        };
+    }
+
+    primitives!(Key, Value);
+
+    impl TryFromJs for KeyVal {
+        fn from_js(js: JsValue) -> Result<Self, SimpleValueError> {
+            let key = match Reflect::get(&js, &JsValue::from_str(Key::PATH)) {
+                Ok(k) => k,
+                Err(e) => return Err(SimpleValueError::DynCast(e)),
+            };
+            let value = match Reflect::get(&js, &JsValue::from_str(Value::PATH)) {
+                Ok(v) => v,
+                Err(e) => return Err(SimpleValueError::DynCast(e)),
+            };
+
+            Ok(Self {
+                key: Key::from_js(key)?,
+                value: Value::from_js(value)?,
+            })
+        }
+    }
+
+    impl TryToJs for KeyVal {
+        fn try_to_js(&self) -> idb_fut::Result<JsValue> {
+            let obj = js_sys::Object::new().unchecked_into::<JsValue>();
+            Reflect::set(&obj, &JsValue::from_str(Key::PATH), &self.key.try_to_js()?)?;
+            Reflect::set(
+                &obj,
+                &JsValue::from_str(Value::PATH),
+                &self.value.try_to_js()?,
+            )?;
+
+            Ok(obj)
+        }
+    }
+};
diff --git a/tests/tests/utils/init.rs b/tests/tests/utils/init.rs
new file mode 100644
index 0000000..4601248
--- /dev/null
+++ b/tests/tests/utils/init.rs
@@ -0,0 +1,50 @@
+use crate::prelude::*;
+use idb_fut::database::{Database, VersionChangeEvent};
+
+pub async fn random_db_with_init<F>(on_upgrade_needed: F) -> Database
+where
+    F: Fn(VersionChangeEvent, Database) -> idb_fut::Result<()> + 'static,
+{
+    Database::open(random_str())
+        .with_on_upgrade_needed(on_upgrade_needed)
+        .await
+        .expect("random_db()")
+}
+
+/// Crate a DB with and an object store with a matching name and default params.
+pub async fn random_db_with_store() -> Database {
+    random_db_with_init(move |_, db| {
+        db.create_object_store(&db.name()).build()?;
+        Ok(())
+    })
+    .await
+}
+
+/// Create a random DB and a store with a matching name that expect [`KeyVal`] inputs.
+pub async fn random_db_keyval() -> Database {
+    random_db_with_init(move |_, db| {
+        db.create_object_store(&db.name())
+            .with_auto_increment(false)
+            .with_key_path(Key::KEY_PATH)
+            .build()?;
+        Ok(())
+    })
+    .await
+}
+
+/// [`random_db_keyval`] + an index with default params.
+#[cfg(feature = "indices")]
+pub async fn random_db_idx_keyval() -> Database {
+    random_db_with_init(move |_, db| {
+        let name = db.name();
+        let store = db
+            .create_object_store(&name)
+            .with_auto_increment(false)
+            .with_key_path(Key::KEY_PATH)
+            .build()?;
+        store.create_index(&name, Value::KEY_PATH).build()?;
+
+        Ok(())
+    })
+    .await
+}
diff --git a/tests/tests/utils/mod.rs b/tests/tests/utils/mod.rs
new file mode 100644
index 0000000..75248b8
--- /dev/null
+++ b/tests/tests/utils/mod.rs
@@ -0,0 +1,17 @@
+pub use conditional_build::BuildDyn;
+
+#[cfg(feature = "_serialise-deserialise-dyn")]
+pub use conditional_build::{DeserialiseDyn, SerialiseDyn};
+
+mod conditional_build;
+pub mod dummy_data;
+pub mod init;
+
+pub fn random_str() -> String {
+    uuid::Uuid::new_v4().to_string()
+}
+
+#[inline]
+pub fn init_logging() {
+    console_log::init_with_level(log::Level::Debug).expect("log init");
+}